On Tue, Nov 17, 2009 at 10:37:18AM +0100, Julien Cristau wrote: > On Tue, Nov 17, 2009 at 11:48:35 +1000, Peter Hutterer wrote: > > > 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 <http://bugs.freedesktop.org/show_bug.cgi?id=25102> > > > > Signed-off-by: Peter Hutterer <[email protected]> > > Tested-by: Adrian Bunk <[email protected]> > > --- > > configure.ac | 6 +++--- > > 1 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/configure.ac b/configure.ac > > index dda4f37..ebbfdd2 100644 > > --- a/configure.ac > > +++ b/configure.ac > > @@ -1880,9 +1880,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]) > > Doesn't this link the Xdmx server against libXaw, libXt and friends for > no reason?
you're right. how about this one then? not 100% sure if that nested PKG_CHECK_MODULES works, it seems to do so here. >From d33844471364496df9b149d4a2015c0099a69fc5 Mon Sep 17 00:00:00 2001 From: Peter Hutterer <[email protected]> Date: Tue, 17 Nov 2009 09:25:47 +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 <http://bugs.freedesktop.org/show_bug.cgi?id=25102> Signed-off-by: Peter Hutterer <[email protected]> --- configure.ac | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index dda4f37..129589e 100644 --- a/configure.ac +++ b/configure.ac @@ -1880,10 +1880,10 @@ AM_CONDITIONAL(XQUARTZ_SPARKLE, [test "x$XQUARTZ_SPARKLE" != "xno"]) AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes]) dnl DMX DDX - PKG_CHECK_MODULES([DMXMODULES], [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES], - [have_dmx=yes], [have_dmx=no]) + PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11], [have_dmx=yes], + [have_dmx=no]), [have_dmx=no]) AC_MSG_CHECKING([whether to build Xdmx DDX]) if test "x$DMX" = xauto; then DMX="$have_dmx" @@ -1916,7 +1916,6 @@ dnl USB sources in DMX require <linux/input.h> dnl Linux sources in DMX require <linux/keyboard.h> AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes", DMX_BUILD_LNX="no") - PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11]) AC_SUBST(XDMXCONFIG_DEP_CFLAGS) AC_SUBST(XDMXCONFIG_DEP_LIBS) PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [$LIBDMX $LIBXEXT x11]) -- 1.6.5.2 _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
