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 /autogen.sh | |
| 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
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 5 |
1 files changed, 5 insertions, 0 deletions
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". |