[mutter/wip/wayland] configure: Adds --with-xwayland-path option

[Robert Bragg <rbragg src gnome org>]

commit dd69fe117a39373400d01c5e51b6bb60f906f54b
Author: Robert Bragg <robert linux intel com>
Date:   Tue Jan 10 18:28:15 2012 +0000

    configure: Adds --with-xwayland-path option
    
    This adds a --with-xwayland-path configure option that can be used to
    specify the absolute path of a headless X server binary supporting
    the wayland xserver protocol.

 configure.in               |    6 ++++++
 src/Makefile.am            |    7 ++++++-
 src/wayland/meta-wayland.c |    4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/configure.in b/configure.in
index fa2409b..5dc71f0 100644
--- a/configure.in
+++ b/configure.in
@@ -125,6 +125,11 @@ AC_ARG_WITH([wayland-protocols],
             ],
             [])
 
+AC_ARG_WITH([xwayland-path],
+            [AS_HELP_STRING([--with-xwayland-path], [Absolute path for an X Wayland server])],
+            [XWAYLAND_PATH="$withval"],
+            [XWAYLAND_PATH="$bindir/Xorg"])
+
 ## try definining HAVE_BACKTRACE
 AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
 
@@ -273,6 +278,7 @@ fi
 if test x$have_wayland = "xyes"; then
   MUTTER_PC_MODULES="$MUTTER_PC_MODULES wayland-server clutter-wayland-compositor-1.0"
   AC_DEFINE(HAVE_WAYLAND, , [Building with Wayland support])
+  AC_SUBST(XWAYLAND_PATH)
 fi
 
 AM_CONDITIONAL(HAVE_WAYLAND, test x$have_wayland = "xyes")
diff --git a/src/Makefile.am b/src/Makefile.am
index 6dd815c..172bed7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,6 @@ INCLUDES=								\
 	-I$(srcdir)/core						\
 	-I$(srcdir)/ui							\
 	-I$(srcdir)/compositor						\
-	-I$(srcdir)/wayland						\
 	-DMUTTER_LIBEXECDIR=\"$(libexecdir)\"				\
 	-DHOST_ALIAS=\"@HOST_ALIAS \"					\
 	-DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"		\
@@ -27,6 +26,12 @@ INCLUDES=								\
 	-DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR \"			\
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
 
+if HAVE_WAYLAND
+INCLUDES += \
+	-I$(srcdir)/wayland						\
+	-DXWAYLAND_PATH='"@XWAYLAND_PATH@"'
+endif
+
 mutter_built_sources = \
 	mutter-enum-types.h \
 	mutter-enum-types.c
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index b951dfb..8957731 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -839,8 +839,8 @@ start_xwayland (MetaWaylandCompositor *compositor)
           display_name = g_strdup_printf (":%d",
                                           compositor->xwayland_display_index);
 
-          if (execl ("/home/bob/local/xserver-xwayland/bin/X",
-                     "/home/bob/local/xserver-xwayland/bin/X",
+          if (execl (XWAYLAND_PATH,
+                     XWAYLAND_PATH,
                      display_name,
                      "-wayland",
                      "-rootless",