From 0994e45d163f121a64084a3b8bf7bb67dc4cef18 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 10 May 2014 19:52:00 -0700 Subject: [PATCH] Revert last two changes. Fixes: debbugs:17438 --- ChangeLog | 7 ------- autogen.sh | 5 ----- 2 files changed, 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b84e06754f..7a3de25e250 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,3 @@ -2014-05-11 Paul Eggert - - 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 * autogen.sh: Check for failing aclocal. diff --git a/autogen.sh b/autogen.sh index 3d26df870d4..32f86ab8200 100755 --- 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". -- 2.39.5