From 0ef15ca9d2d9c78c79a2771c550563bc6931b365 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 17 Nov 2009 11:48:35 +1000 Subject: [PATCH] Move xdmxconfig modules into DMX conditionals (#25102) xdmxconfig requires additional modules not checked for if Xdmx build is set to auto (the default). This may lead to build errors if the Xdmx modules are installed, but not the extra ones required for xdmxconfig. X.Org Bug 25102 Signed-off-by: Peter Hutterer Tested-by: Adrian Bunk Signed-off-by: Keith Packard --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 58d5ead07..417aa4fc5 100644 --- a/configure.ac +++ b/configure.ac @@ -1881,9 +1881,9 @@ AM_CONDITIONAL(XQUARTZ_SPARKLE, [test "x$XQUARTZ_SPARKLE" != "xno"]) AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes]) dnl DMX DDX - +XDMXCONFIG_MODULES="xaw7 xmu xt xpm x11" PKG_CHECK_MODULES([DMXMODULES], - [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES], + [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES $XDMXCONFIG_MODULES], [have_dmx=yes], [have_dmx=no]) AC_MSG_CHECKING([whether to build Xdmx DDX]) if test "x$DMX" = xauto; then @@ -1917,7 +1917,7 @@ dnl USB sources in DMX require dnl Linux sources in DMX require AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes", DMX_BUILD_LNX="no") - PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11]) + PKG_CHECK_MODULES([XDMXCONFIG_DEP], [$XDMXCONFIG_MODULES]) AC_SUBST(XDMXCONFIG_DEP_CFLAGS) AC_SUBST(XDMXCONFIG_DEP_LIBS) PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [$LIBDMX $LIBXEXT x11])