From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 27 Jul 2010 20:44:54 +0000 (+0200)
Subject: Bootstrap: let the user choose which autoconf to use.
X-Git-Tag: v1.11.1b~58^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=103367103228d5ae88df7aace5c87c5e82d82e11;p=thirdparty%2Fautomake.git

Bootstrap: let the user choose which autoconf to use.

* bootstrap ($AUTOCONF): New variable, from the environment.
($AUTOM4TE): Likewise, for clarity.
Use "$AUTOCONF" instead of calling "autoconf" directly.
---

diff --git a/ChangeLog b/ChangeLog
index 10621f4d8..e424d30ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-08-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+	Bootstrap: let the user choose which autoconf to use.
+	* bootstrap ($AUTOCONF): New variable, from the environment.
+	($AUTOM4TE): Likewise, for clarity.
+	Use "$AUTOCONF" instead of calling "autoconf" directly.
+
 	Minor improvements to tests ar*.test.
 	* tests/ar.test: Add trailing `:' command.
 	* tests/ar2.test: Likewise, and make grepping of generated
diff --git a/bootstrap b/bootstrap
index 7766bd3e8..ebcedbe83 100755
--- a/bootstrap
+++ b/bootstrap
@@ -35,6 +35,12 @@ set -e
 # Set program basename.
 me=`echo "$0" | sed 's,^.*/,,'`
 
+# Let user choose which version of autoconf and autom4te to use.
+: ${AUTOCONF=autoconf}
+export AUTOCONF  # might be used by aclocal and/or automake
+: ${AUTOM4TE=autom4te}
+export AUTOM4TE  # ditto
+
 # Find perl.  Code based on Autoconf, but without non-POSIX support.
 if test -z "$PERL"; then
   save_IFS=$IFS
@@ -133,7 +139,7 @@ cd ..
 
 # Run the autotools.
 $PERL ./aclocal.tmp -I m4
-autoconf
+$AUTOCONF
 $PERL ./automake.tmp
 
 # Remove temporary files and directories.