Package: pkg-config
Version: 0.16.0-1
Severity: important

GTK+ does the following in its configure.in:

PKG_CHECK_MODULES(BASE_DEPENDENCIES,
  [glib-2.0 >= glib_required_version dnl
   atk >= atk_required_version dnl
   pango >= pango_required_version])

This worked perfectly fine with the older pkg-config pkg.m4. With the
new one, one gets:

configure.in:131: error: possibly undefined macro: dnl

and configure bails.

Something is going haywire with autoconf and m4 expansion. The attached
patch fixes it.

-Yosh
--- /usr/share/aclocal/pkg.m4   2005-03-30 08:01:48.000000000 -0800
+++ pkg.m4      2005-04-09 18:17:38.000000000 -0700
@@ -67,11 +67,12 @@
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 
+pkg_check_modules="$2"
 pkg_failed=no
 AC_CACHE_CHECK([for $1][_CFLAGS], [pkg_cv_][$1][_CFLAGS],
-       [_PKG_CONFIG([$1][_CFLAGS], [cflags], [[$2]])])
+       [_PKG_CONFIG([$1][_CFLAGS], [cflags], [$pkg_check_modules])])
 AC_CACHE_CHECK([for $1][_LIBS], [pkg_cv_][$1][_LIBS],
-       [_PKG_CONFIG([$1][_LIBS], [libs], [[$2]])])
+       [_PKG_CONFIG([$1][_LIBS], [libs], [$pkg_check_modules])])
 
 if test $pkg_failed = yes; then
        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
@@ -79,7 +80,7 @@
        echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
 
        ifelse([$4], , [AC_MSG_ERROR(dnl
-[[Package requirements ($2) were not met.
+[[Package requirements ($pkg_check_modules) were not met.
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 

Reply via email to