summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2014-05-10 19:27:53 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2014-05-10 19:27:53 -0700
commiteab25ea7c0d59af4a753cc4ac7c119e5528e8a42 (patch)
tree631375bebe66012f1794bdc98e050ecdfd07e29f
parent2f9b4cfc75f0f52c6e13994659d7cfbe9be85e53 (diff)
downloademacs-eab25ea7c0d59af4a753cc4ac7c119e5528e8a42.tar.gz
Require pkg-config 0.26 or later.
Earlier versions are buggy, as pkg-config --libs can output nothing, which causes xrandr link failures. * configure.ac (PKG_PROG_PKG_CONFIG): Bump from 0.9.0 to 0.26. Fixes: debbugs:17438
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a3de25e250..31970508c2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-11 Paul Eggert <eggert@cs.ucla.edu>
+
+ Require pkg-config 0.26 or later (Bug#17438).
+ Earlier versions are buggy, as pkg-config --libs can output
+ nothing, which causes xrandr link failures.
+ * configure.ac (PKG_PROG_PKG_CONFIG): Bump from 0.9.0 to 0.26.
+
2014-05-07 Glenn Morris <rgm@gnu.org>
* autogen.sh: Check for failing aclocal.
diff --git a/configure.ac b/configure.ac
index d398e31f89e..a1dcca014be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1349,7 +1349,7 @@ searched by pkg-config])
pre_PKG_CONFIG_CFLAGS=$CFLAGS
pre_PKG_CONFIG_LIBS=$LIBS
-PKG_PROG_PKG_CONFIG(0.9.0)
+PKG_PROG_PKG_CONFIG(0.26)
dnl EMACS_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4)
dnl acts like PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4,