From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 11 May 2014 02:27:53 +0000 (-0700)
Subject: Require pkg-config 0.26 or later.
X-Git-Tag: emacs-25.0.90~2640^2~127
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eab25ea7c0d59af4a753cc4ac7c119e5528e8a42;p=emacs.git

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
---

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,