diff options
| author | Robert Bragg <robert@linux.intel.com> | 2012-01-10 18:28:15 +0000 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2013-05-07 18:11:18 +0100 |
| commit | fca54dcaac20a628d2b6061929ce1ab1b0340b48 (patch) | |
| tree | 27c0a0c19fc57601ef7723ee37324d1b847f7f80 | |
| parent | fe778dc635044f47d8dfc77de290f6802b0c6978 (diff) | |
| download | mutter-fca54dcaac20a628d2b6061929ce1ab1b0340b48.tar.gz | |
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.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 62eda7109..c7dbf30a3 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 e2cec915e..d8edb4942 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 |