[PATCH] Move xdmxconfig modules into DMX conditionals (#25102)

[Peter Hutterer]

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 <peter.hutterer at who-t.net>
> > Tested-by: Adrian Bunk <bunk at stusta.de>
> > ---
> >  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.