isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

configure: Adds --with-xwayland-path option

Browse Source 
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.
This commit is contained in:
Robert Bragg 2012-01-10 18:28:15 +00:00 committed by Jasper St. Pierre
parent 6585a5760b
commit b4d108dac6
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -128,6 +128,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 AM_GLIB_GNU_GETTEXT
## here we get the flags we'll actually use ## here we get the flags we'll actually use
@ -235,6 +240,8 @@ if test x$enable_wayland = "xyes"; then
AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols])) AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols]))
AC_SUBST([WAYLAND_SCANNER]) AC_SUBST([WAYLAND_SCANNER])
AC_SUBST(XWAYLAND_PATH)
MUTTER_PC_MODULES="$MUTTER_PC_MODULES wayland-server clutter-wayland-compositor-1.0" MUTTER_PC_MODULES="$MUTTER_PC_MODULES wayland-server clutter-wayland-compositor-1.0"
AC_DEFINE(HAVE_WAYLAND, , [Building with Wayland support]) AC_DEFINE(HAVE_WAYLAND, , [Building with Wayland support])
have_wayland=yes have_wayland=yes

6
src/Makefile.am
View File

@ -29,6 +29,12 @@ INCLUDES= \
-DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\" \ -DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\" \
-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
if HAVE_WAYLAND
INCLUDES += \
-I$(srcdir)/wayland \
-DXWAYLAND_PATH='"@XWAYLAND_PATH@"'
endif
mutter_built_sources = \ mutter_built_sources = \
mutter-enum-types.h \ mutter-enum-types.h \
mutter-enum-types.c mutter-enum-types.c