aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-05-02 19:31:41 -0400
committerGlenn Morris2014-05-02 19:31:41 -0400
commit53a7da76db34b7fa8b3702760024865e46efbc78 (patch)
tree51eb1586787e0e1000d9c54c3478aaea33a6ccdb
parentef9ea0a623c0b801b20ff54fa9318a74a84793f2 (diff)
downloademacs-53a7da76db34b7fa8b3702760024865e46efbc78.tar.gz
emacs-53a7da76db34b7fa8b3702760024865e46efbc78.zip
* configure.ac (PKG_CONFIG_PATH): Declare with AC_ARG_VAR.
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac3
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index dd63aa0812b..648017a6dd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
12014-05-02 Glenn Morris <rgm@gnu.org> 12014-05-02 Glenn Morris <rgm@gnu.org>
2 2
3 * configure.ac (PKG_CONFIG_PATH): Declare with AC_ARG_VAR.
4
3 * configure.ac (--with-pkg-config-prog): Remove. 5 * configure.ac (--with-pkg-config-prog): Remove.
4 Use the PKG_CONFIG environment variable instead if you need it. 6 Use the PKG_CONFIG environment variable instead if you need it.
5 7
diff --git a/configure.ac b/configure.ac
index 81b8537f0bd..ee3216d63f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1332,6 +1332,9 @@ AC_DEFINE_UNQUOTED(SYSTEM_TYPE, "$SYSTEM_TYPE",
1332 1332
1333m4_pattern_forbid([^PKG_]) 1333m4_pattern_forbid([^PKG_])
1334 1334
1335AC_ARG_VAR(PKG_CONFIG_PATH, [Colon-separated list of directories
1336searched by pkg-config])
1337
1335pre_PKG_CONFIG_CFLAGS=$CFLAGS 1338pre_PKG_CONFIG_CFLAGS=$CFLAGS
1336pre_PKG_CONFIG_LIBS=$LIBS 1339pre_PKG_CONFIG_LIBS=$LIBS
1337 1340