mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-25 19:11:56 +00:00
Revert last two changes.
Fixes: debbugs:17438
This commit is contained in:
parent
68b067b393
commit
0994e45d16
@ -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.
|
||||
|
@ -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".
|
||||
|
Loading…
Reference in New Issue
Block a user