[PATCH] compositor: Fix compilation without xserver launcher

Benjamin Franzke benjaminfranzke at googlemail.com
Wed Mar 7 10:42:10 PST 2012


---
 src/compositor.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/compositor.c b/src/compositor.c
index 0e33971..96e7fe7 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -2561,8 +2561,10 @@ int main(int argc, char *argv[])
 	ec->option_idle_time = option_idle_time;
 	ec->idle_time = option_idle_time;
 
+#ifdef BUILD_XSERVER_LAUNCHER
 	if (xserver)
 		weston_xserver_init(ec);
+#endif
 
 	if (shell_init(ec) < 0)
 		exit(EXIT_FAILURE);
@@ -2580,8 +2582,10 @@ int main(int argc, char *argv[])
 	/* prevent further rendering while shutting down */
 	ec->state = WESTON_COMPOSITOR_SLEEPING;
 
+#ifdef BUILD_XSERVER_LAUNCHER
 	if (xserver)
 		weston_xserver_destroy(ec);
+#endif
 
 	ec->shell->destroy(ec->shell);
 
-- 
1.7.3.4



More information about the wayland-devel mailing list