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

[Neil Roberts <nroberts src gnome org>]

commit 9407f2f4e6022fe77769824ada7b7d27723c05c3
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.ac    |    6 ++++++
 src/Makefile.am |    6 ++++++
 2 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b6ecc91..5f0e148 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,6 +134,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"])
+
 AM_GLIB_GNU_GETTEXT
 
 ## here we get the flags we'll actually use
@@ -254,6 +259,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 e2cec91..d8edb49 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,6 +29,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