From 70bf99f09cac43a9016039f762e5186c6ca2b6c6 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 16 Oct 2012 17:14:01 +1100 Subject: [PATCH 17/38] xwayland: Introduce an auto mode for --enable-wayland Signed-off-by: Daniel Stone --- configure.ac | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 8078846..c60fd44 100644 --- a/configure.ac +++ b/configure.ac @@ -629,7 +629,7 @@ AC_ARG_ENABLE(clientids, AS_HELP_STRING([--disable-clientids], [Build Xorg AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess], [Build Xorg with pciaccess library (default: enabled)]), [PCI=$enableval], [PCI=yes]) AC_ARG_ENABLE(linux_acpi, AC_HELP_STRING([--disable-linux-acpi], [Disable building ACPI support on Linux (if available).]), [enable_linux_acpi=$enableval], [enable_linux_acpi=yes]) AC_ARG_ENABLE(linux_apm, AC_HELP_STRING([--disable-linux-apm], [Disable building APM support on Linux (if available).]), [enable_linux_apm=$enableval], [enable_linux_apm=yes]) -AC_ARG_ENABLE(wayland, AS_HELP_STRING([--disable-wayland], [Build Wayland extension (default: enabled)]), [WAYLAND=$enableval], [WAYLAND=yes]) +AC_ARG_ENABLE(wayland, AS_HELP_STRING([--disable-wayland], [Build Wayland extension (default: auto)]), [WAYLAND=$enableval], [WAYLAND=auto]) dnl DDXes. AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) @@ -1020,12 +1020,16 @@ if test "x$MITSHM" = xauto; then MITSHM="$ac_cv_sysv_ipc" fi -AM_CONDITIONAL(WAYLAND, [test "x$WAYLAND" = xyes]) +WAYLAND_MODULES="wayland-client libdrm" +if test "x$WAYLAND" = xauto; then + PKG_CHECK_MODULES(XWAYLAND, $WAYLAND_MODULES, [WAYLAND=yes], [WAYLAND=no]) +fi if test "x$WAYLAND" = xyes; then + PKG_CHECK_MODULES(XWAYLAND, $WAYLAND_MODULES) AC_DEFINE(XORG_WAYLAND, 1, [Support wayland mode]) - REQUIRED_MODULES="$REQUIRED_MODULES wayland-client" WAYLAND_SCANNER_RULES(['$(top_srcdir)/hw/xfree86/xwayland']) fi +AM_CONDITIONAL(WAYLAND, [test "x$WAYLAND" = xyes]) AM_CONDITIONAL(MITSHM, [test "x$MITSHM" = xyes]) if test "x$MITSHM" = xyes; then -- 1.8.4.2