summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>2010-06-27 12:15:56 +0200
committerTollef Fog Heen <tfheen@err.no>2011-05-15 14:20:17 +0200
commit4939bdb9a629ce1f6343a69f92f133fedbb223f6 (patch)
tree6dd920f168b8b5b56e796f139fe38d0c00bc25d6
parentb02c40bca4d64da65b6f78d6ff9ca2d28df6f6b8 (diff)
Allow documented environment variables in autoconf
It might be useful to write something like sdkflags=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server` in configure.ac macros. Unfortunately, this will be blocked because 'PKG_CONFIG_SYSROOT' is a forbidden m4 pattern. This patch extends the list of allowed pattern by the names of documented pkg-config environment variables.
-rw-r--r--pkg.m43
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg.m4 b/pkg.m4
index a63b535..9a71878 100644
--- a/pkg.m4
+++ b/pkg.m4
@@ -26,7 +26,8 @@
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH|_LIBDIR)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])