2009-03-30 Tollef Fog Heen <tfheen@err.no>

	* pkg.m4: Add PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR to the list of
	precious directories.  (AC_ARG_VAR)

diff --git a/ChangeLog b/ChangeLog
index d8934e0a65169d8e3b639a5f3b44b82d043e6387..7d86de5c3cf4254379b308572993426facb45394 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-03-30  Tollef Fog Heen  <tfheen@err.no>
 
+       * pkg.m4: Add PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR to the list of
+       precious directories.  (AC_ARG_VAR)
+
        * popthelp.c (poptPrintUsage,poptPrintHelp): Add [LIBRARIES] to
        help output.  Debian #389066
 

diff --git a/pkg.m4 b/pkg.m4
index a0b9cd45dfc3c16325a03686e39a081ce766c5b0..0be5f678e8a44fdb51501ab44036d7af79dfb0cd 100644 (file)
--- a/pkg.m4
+++ b/pkg.m4
@@ -26,7 +26,10 @@
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+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])
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
        AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi