From: Tollef Fog Heen <tfheen@err.no>
Date: Mon, 30 Mar 2009 18:06:32 +0000 (+0200)
Subject: 2009-03-30  Tollef Fog Heen  <tfheen@err.no>
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a25f7e980e5c36665d91e916d9074524709ad2bc;p=pkg-config

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 d8934e0..7d86de5 100644
--- 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 a0b9cd4..0be5f67 100644
--- 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