mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00
Code Issues Releases Activity

* autogen.sh: Check any pre-existing ACLOCAL_PATH.

Browse Source
This commit is contained in:
Glenn Morris 2014-05-05 13:22:32 -04:00
parent d6509ba674
commit e8e2626f06
2 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2014-05-05 Glenn Morris <rgm@gnu.org>
* autogen.sh: Check any pre-existing ACLOCAL_PATH.
2014-05-04 Paul Eggert <eggert@cs.ucla.edu> 2014-05-04 Paul Eggert <eggert@cs.ucla.edu>
Consult libpng-config more consistently (Bug#17339). Consult libpng-config more consistently (Bug#17339).

17
autogen.sh
View File

@ -212,6 +212,22 @@ echo "Checking for pkg.m4..."
AUTORECONF_ENV= AUTORECONF_ENV=
env_space= env_space=
ac_dir=`aclocal --print-ac-dir` && test -r "$ac_dir/pkg.m4" || { ac_dir=`aclocal --print-ac-dir` && test -r "$ac_dir/pkg.m4" || {
# Maybe ACLOCAL_PATH is already set-up.
if test -n "$ACLOCAL_PATH"; then
oIFS=$IFS
IFS=:
for dir in $ACLOCAL_PATH; do
if test -r "$dir/pkg.m4"; then
AUTORECONF_ENV="ACLOCAL_PATH='$ACLOCAL_PATH'"
env_space=' '
break
fi
done
IFS=$oIFS
fi
if test -z "$AUTORECONF_ENV"; then
oIFS=$IFS oIFS=$IFS
IFS=: IFS=:
before_first_aclocal=true before_first_aclocal=true
@ -233,6 +249,7 @@ ac_dir=`aclocal --print-ac-dir` && test -r "$ac_dir/pkg.m4" || {
fi fi
done done
IFS=$oIFS IFS=$oIFS
fi
## OK, maybe pkg-config is in a weird place (eg on hydra). ## OK, maybe pkg-config is in a weird place (eg on hydra).
if test -z "$AUTORECONF_ENV"; then if test -z "$AUTORECONF_ENV"; then