diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-05-10 19:47:57 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-05-10 19:47:57 -0700 |
| commit | 68b067b393816584d2ab6356d3706aea41352209 (patch) | |
| tree | 7efe25c02deed9b7ea7dacccd38037ae058c7164 | |
| parent | eab25ea7c0d59af4a753cc4ac7c119e5528e8a42 (diff) | |
| download | emacs-68b067b393816584d2ab6356d3706aea41352209.tar.gz | |
Require pkg-config 0.26 or later in autogen.sh only.
* autogen.sh (pkg_config_min): Make this at least 0.26.
* configure.ac (PKG_PROG_PKG_CONFIG): Revert back to 0.9.0.
Fixes: debbugs:17438
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rwxr-xr-x | autogen.sh | 5 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 31970508c2d..7b84e06754f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,7 @@ 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. + * autogen.sh (pkg_config_min): Make this at least 0.26. 2014-05-07 Glenn Morris <rgm@gnu.org> diff --git a/autogen.sh b/autogen.sh index 32f86ab8200..3d26df870d4 100755 --- a/autogen.sh +++ b/autogen.sh @@ -42,6 +42,11 @@ 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". diff --git a/configure.ac b/configure.ac index a1dcca014be..d398e31f89e 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.26) +PKG_PROG_PKG_CONFIG(0.9.0) 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, |