* autoreconf.sh (autoconf, autoheader): Be more conscientious when

looking for the executable.
* autoupdate.sh: Likewise.
* autoheader.sh: Likewise.
Suggested by Alexandre Oliva.

diff --git a/ChangeLog b/ChangeLog
index df9946828a7d0e66fcb9ac2e21264387430276e6..7168b4cfbc03311832327e7201d432a096bf4615 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-05-26  Akim Demaille  <akim@epita.fr>
+
+       * autoreconf.sh (autoconf, autoheader): Be more conscientious when
+       looking for the executable.
+       * autoupdate.sh: Likewise.
+       * autoheader.sh: Likewise.
+       Suggested by Alexandre Oliva.
+
 2000-05-26  Akim Demaille  <akim@epita.fr>
 
        Thanks to --program-transform-name, `autoconf' might be install as

diff --git a/autoheader.in b/autoheader.in
index 057527f3331b31427a695864cfd56acb16b33fb0..e6a6e2f8a2ba9f76c5ab948fe7c0c0654b824f12 100644 (file)
--- a/autoheader.in
+++ b/autoheader.in
@@ -69,11 +69,15 @@ if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
 # Variables.
 : ${AC_MACRODIR=@datadir@}
-if test -n "$AUTOCONF"; then
-  autoconf=$AUTOCONF
-else
-  autoconf=`echo "$0" | sed -e 's/[^/]*$//`"@autoconf-name@"
-fi
+dir=`echo "$0" | sed -e 's/[^/]*$//'`
+# We test "$dir/autoconf" in case we are in the build tree, in which case
+# the names are not transformed yet.
+for autoconf in "$AUTOCONF" \
+                "$dir/@autoconf-name@" \
+                "$dir/autoconf" \
+                "@bindir@/@autoconf-name@"; do
+  test -f "$autoconf" && break
+done
 debug=false
 localdir=.
 tmp=

diff --git a/autoheader.sh b/autoheader.sh
index 057527f3331b31427a695864cfd56acb16b33fb0..e6a6e2f8a2ba9f76c5ab948fe7c0c0654b824f12 100644 (file)
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -69,11 +69,15 @@ if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
 # Variables.
 : ${AC_MACRODIR=@datadir@}
-if test -n "$AUTOCONF"; then
-  autoconf=$AUTOCONF
-else
-  autoconf=`echo "$0" | sed -e 's/[^/]*$//`"@autoconf-name@"
-fi
+dir=`echo "$0" | sed -e 's/[^/]*$//'`
+# We test "$dir/autoconf" in case we are in the build tree, in which case
+# the names are not transformed yet.
+for autoconf in "$AUTOCONF" \
+                "$dir/@autoconf-name@" \
+                "$dir/autoconf" \
+                "@bindir@/@autoconf-name@"; do
+  test -f "$autoconf" && break
+done
 debug=false
 localdir=.
 tmp=

diff --git a/autoreconf.in b/autoreconf.in
index 681e6aab3032a45a18733ee3b8479b4966f48b65..a5513d3063cbdd4df3696b2863b853cd4434c86e 100644 (file)
--- a/autoreconf.in
+++ b/autoreconf.in
@@ -69,16 +69,21 @@ if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
 # Variables.
 : ${AC_MACRODIR=@datadir@}
-if test -n "$AUTOCONF"; then
-  autoconf=$AUTOCONF
-else
-  autoconf=`echo "$0" | sed -e 's/[^/]*$//`"@autoconf-name@"
-fi
-if test -n "$AUTOHEADER"; then
-  autoheader=$AUTOHEADER
-else
-  autoheader=`echo "$0" | sed -e 's/[^/]*$//`"@autoheader-name@"
-fi
+dir=`echo "$0" | sed -e 's/[^/]*$//'`
+# We test "$dir/autoconf" in case we are in the build tree, in which case
+# the names are not transformed yet.
+for autoconf in "$AUTOCONF" \
+                "$dir/@autoconf-name@" \
+                "$dir/autoconf" \
+                "@bindir@/@autoconf-name@"; do
+  test -f "$autoconf" && break
+done
+for autoheader in "$AUTOHEADER" \
+                  "$dir/@autoheader-name@" \
+                  "$dir/autoheader" \
+                  "@bindir@/@autoheader-name@"; do
+  test -f "$autoheader" && break
+done
 automake_mode=--gnu
 automake_deps=
 force=no

diff --git a/autoreconf.sh b/autoreconf.sh
index 681e6aab3032a45a18733ee3b8479b4966f48b65..a5513d3063cbdd4df3696b2863b853cd4434c86e 100644 (file)
--- a/autoreconf.sh
+++ b/autoreconf.sh
@@ -69,16 +69,21 @@ if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
 # Variables.
 : ${AC_MACRODIR=@datadir@}
-if test -n "$AUTOCONF"; then
-  autoconf=$AUTOCONF
-else
-  autoconf=`echo "$0" | sed -e 's/[^/]*$//`"@autoconf-name@"
-fi
-if test -n "$AUTOHEADER"; then
-  autoheader=$AUTOHEADER
-else
-  autoheader=`echo "$0" | sed -e 's/[^/]*$//`"@autoheader-name@"
-fi
+dir=`echo "$0" | sed -e 's/[^/]*$//'`
+# We test "$dir/autoconf" in case we are in the build tree, in which case
+# the names are not transformed yet.
+for autoconf in "$AUTOCONF" \
+                "$dir/@autoconf-name@" \
+                "$dir/autoconf" \
+                "@bindir@/@autoconf-name@"; do
+  test -f "$autoconf" && break
+done
+for autoheader in "$AUTOHEADER" \
+                  "$dir/@autoheader-name@" \
+                  "$dir/autoheader" \
+                  "@bindir@/@autoheader-name@"; do
+  test -f "$autoheader" && break
+done
 automake_mode=--gnu
 automake_deps=
 force=no

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 057527f3331b31427a695864cfd56acb16b33fb0..e6a6e2f8a2ba9f76c5ab948fe7c0c0654b824f12 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -69,11 +69,15 @@ if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
 # Variables.
 : ${AC_MACRODIR=@datadir@}
-if test -n "$AUTOCONF"; then
-  autoconf=$AUTOCONF
-else
-  autoconf=`echo "$0" | sed -e 's/[^/]*$//`"@autoconf-name@"
-fi
+dir=`echo "$0" | sed -e 's/[^/]*$//'`
+# We test "$dir/autoconf" in case we are in the build tree, in which case
+# the names are not transformed yet.
+for autoconf in "$AUTOCONF" \
+                "$dir/@autoconf-name@" \
+                "$dir/autoconf" \
+                "@bindir@/@autoconf-name@"; do
+  test -f "$autoconf" && break
+done
 debug=false
 localdir=.
 tmp=

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 681e6aab3032a45a18733ee3b8479b4966f48b65..a5513d3063cbdd4df3696b2863b853cd4434c86e 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -69,16 +69,21 @@ if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
 # Variables.
 : ${AC_MACRODIR=@datadir@}
-if test -n "$AUTOCONF"; then
-  autoconf=$AUTOCONF
-else
-  autoconf=`echo "$0" | sed -e 's/[^/]*$//`"@autoconf-name@"
-fi
-if test -n "$AUTOHEADER"; then
-  autoheader=$AUTOHEADER
-else
-  autoheader=`echo "$0" | sed -e 's/[^/]*$//`"@autoheader-name@"
-fi
+dir=`echo "$0" | sed -e 's/[^/]*$//'`
+# We test "$dir/autoconf" in case we are in the build tree, in which case
+# the names are not transformed yet.
+for autoconf in "$AUTOCONF" \
+                "$dir/@autoconf-name@" \
+                "$dir/autoconf" \
+                "@bindir@/@autoconf-name@"; do
+  test -f "$autoconf" && break
+done
+for autoheader in "$AUTOHEADER" \
+                  "$dir/@autoheader-name@" \
+                  "$dir/autoheader" \
+                  "@bindir@/@autoheader-name@"; do
+  test -f "$autoheader" && break
+done
 automake_mode=--gnu
 automake_deps=
 force=no