Revert last two changes.

Fixes: debbugs:17438

diff --git a/ChangeLog b/ChangeLog
index 7b84e06754f2d1d4ec0a6fd9a21ad190df83ec1e..7a3de25e2501bcad220033f0c9d12f86e87480ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,3 @@
-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.
-       * autogen.sh (pkg_config_min): Make this at least 0.26.
-
 2014-05-07  Glenn Morris  <rgm@gnu.org>
 
        * autogen.sh: Check for failing aclocal.

diff --git a/autogen.sh b/autogen.sh
index 3d26df870d4d6418acc10dc683d6573d88cc865d..32f86ab82003889f53318f4beb506e5c56b5de8d 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -42,11 +42,6 @@ autoconf_min=`sed -n 's/^ *AC_PREREQ(\([0-9\.]*\)).*/\1/p' configure.ac`
 automake_min=`sed -n 's/^ *AM_INIT_AUTOMAKE(\([0-9\.]*\)).*/\1/p' configure.ac`
 
 pkg_config_min=`sed -n 's/^ *PKG_PROG_PKG_CONFIG(\([0-9\.]*\)).*/\1/p' configure.ac`
-# Building from the repository needs pkg-config 0.26 or later; see Bug#17438.
-case $pkg_config_min in
-  0.[0-9] | 0.[0-9].* | 0.1[0-9] | 0.1[0-9].* | 0.2[0-5] | 0.2[0-5].* )
-    pkg_config_min=0.26
-esac
 
 ## $1 = program, eg "autoconf".
 ## Echo the version string, eg "2.59".