diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-05-05 13:22:32 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-05-05 13:22:32 -0400 |
| commit | e8e2626f06f068ee523489b2c37d9fe2c65fb3c0 (patch) | |
| tree | 38176ab1fdd721f6108526412a27742ef61797e3 /autogen.sh | |
| parent | d6509ba674a33136e9358902692ac3a5be1a4ef2 (diff) | |
| download | emacs-e8e2626f06f068ee523489b2c37d9fe2c65fb3c0.tar.gz | |
* autogen.sh: Check any pre-existing ACLOCAL_PATH.
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 57 |
1 files changed, 37 insertions, 20 deletions
diff --git a/autogen.sh b/autogen.sh index d04893316a4..35175e70b1c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -212,27 +212,44 @@ echo "Checking for pkg.m4..." AUTORECONF_ENV= env_space= ac_dir=`aclocal --print-ac-dir` && test -r "$ac_dir/pkg.m4" || { - oIFS=$IFS - IFS=: - before_first_aclocal=true - for dir in $PATH; do - if test -x "$dir/aclocal"; then - if $before_first_aclocal; then - before_first_aclocal=false - elif ac_dir=`"$dir/aclocal" --print-ac-dir` && test -r "$ac_dir/pkg.m4" - then - case $ACLOCAL_PATH in - '') ACLOCAL_PATH=$ac_dir;; - ?*) ACLOCAL_PATH=$ACLOCAL_PATH:$ac_dir;; - esac - export ACLOCAL_PATH - AUTORECONF_ENV="ACLOCAL_PATH='$ACLOCAL_PATH'" - env_space=' ' - break + + # 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 - fi - done - IFS=$oIFS + done + IFS=$oIFS + fi + + if test -z "$AUTORECONF_ENV"; then + oIFS=$IFS + IFS=: + before_first_aclocal=true + for dir in $PATH; do + if test -x "$dir/aclocal"; then + if $before_first_aclocal; then + before_first_aclocal=false + elif ac_dir=`"$dir/aclocal" --print-ac-dir` && test -r "$ac_dir/pkg.m4" + then + case $ACLOCAL_PATH in + '') ACLOCAL_PATH=$ac_dir;; + ?*) ACLOCAL_PATH=$ACLOCAL_PATH:$ac_dir;; + esac + export ACLOCAL_PATH + AUTORECONF_ENV="ACLOCAL_PATH='$ACLOCAL_PATH'" + env_space=' ' + break + fi + fi + done + IFS=$oIFS + fi ## OK, maybe pkg-config is in a weird place (eg on hydra). if test -z "$AUTORECONF_ENV"; then |