commit 0eee939d76a4f3c507785cb40b99ba0d02fc981b
author Benjamin Franzke <benjaminfranzke@googlemail.com> Wed Mar 07 19:42:10 2012 +0100
committer Kristian Høgsberg <krh@bitplanet.net> Thu Mar 08 13:15:02 2012 -0500
tree fd1b239c7e49e55ba38cc7ef603dcaa249c76505
parent de56c311d94e6df37537b9e05ec72863906902ff

compositor: Fix compilation without xserver launcher

src/compositor.c

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 @@
 	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 @@
 	/* 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);