[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117065: * autogen.sh: Check any pre-existing ACLOCA
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r117065: * autogen.sh: Check any pre-existing ACLOCAL_PATH. |
Date: |
Mon, 05 May 2014 17:22:35 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117065
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2014-05-05 13:22:32 -0400
message:
* autogen.sh: Check any pre-existing ACLOCAL_PATH.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
autogen.sh autogen.sh-20091113204419-o5vbwnq5f7feedwu-2495
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-05-04 21:28:08 +0000
+++ b/ChangeLog 2014-05-05 17:22:32 +0000
@@ -1,3 +1,7 @@
+2014-05-05 Glenn Morris <address@hidden>
+
+ * autogen.sh: Check any pre-existing ACLOCAL_PATH.
+
2014-05-04 Paul Eggert <address@hidden>
Consult libpng-config more consistently (Bug#17339).
=== modified file 'autogen.sh'
--- a/autogen.sh 2014-05-04 21:18:30 +0000
+++ b/autogen.sh 2014-05-05 17:22:32 +0000
@@ -212,27 +212,44 @@
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
- fi
- fi
- done
- IFS=$oIFS
+
+ # 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
+ 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117065: * autogen.sh: Check any pre-existing ACLOCAL_PATH.,
Glenn Morris <=