Nested pkg-config macros in configure.ac
Peter Hutterer
peter.hutterer at who-t.net
Mon Nov 30 22:45:16 PST 2009
On Sat, Nov 28, 2009 at 09:50:52PM -0500, Gaetan Nadon wrote:
> From 5570d7b274e6b3f369c7d3810a9f88fa9ffe2540 Mon Sep 17 00:00:00 2001
> From: Gaetan Nadon <memsize at videotron.ca>
> Date: Sat, 28 Nov 2009 21:32:47 -0500
> Subject: [PATCH] configure.ac: error while checking for XDMXCONFIG_DEP
>
> Introduced in commit 9998105a387e0294054502331a56e1e020cd93e4
> The replacement third parameters to PKG_CHECK_MODULES([DMXMODULES]
> was not quoted.
> ---
> configure.ac | 14 +++++++++-----
> 1 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 8500db4..1038734 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1808,11 +1808,15 @@ 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],
> - PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11], [have_dmx=yes],
> - [have_dmx=no]),
> - [have_dmx=no])
> +PKG_CHECK_MODULES(
> + [DMXMODULES],
> + [xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES],
> + [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"
> --
> 1.6.0.4
Gaetan, please add your signed-off-by to this patch, I'll send a new pull
request to keith once we get it. Thanks.
Cheers,
Peter
More information about the xorg-devel
mailing list