* bootstrap: Allow overriding the location aclocal, automake,

autoconf, autoheader from the environment.

diff --git a/ChangeLog b/ChangeLog
index 6c46b054bb85e696cc13ce74b95960df2ca5a27e..8dd5cb70439ded0d74ab880dfd9d6ec4731e644e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-04-22  Peter Eisentraut  <peter_e@gmx.net>
 
+       * bootstrap: Allow overriding the location aclocal, automake,
+       autoconf, autoheader from the environment.
+
        * demo/Makefile.am: Automake 1.4e does not allow `+=' assignments
        if the variable was not set with `=' earlier.  `+=' was not useful
        here anyway.

diff --git a/bootstrap b/bootstrap
index 7bbbdaaf9459d03b1660e34a86c80024ab766e66..7150557caa976de32d6b85925d365c0ecf9ebc39 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -2,7 +2,11 @@
 
 # helps bootstrapping libtool, when checked out from CVS
 # requires GNU autoconf and GNU automake
-# this is not meant to go into the distributions
+
+: ${ACLOCAL=aclocal}
+: ${AUTOMAKE=automake}
+: ${AUTOCONF=autoconf}
+: ${AUTOHEADER=autoheader}
 
 rm -f acinclude.m4
 ln -s libtool.m4 acinclude.m4
@@ -10,9 +14,9 @@ ln -s libtool.m4 acinclude.m4
 touch ltconfig
 touch ltmain.sh
 touch libtoolize
-aclocal
-automake --gnu --add-missing
-autoconf
+${ACLOCAL}
+${AUTOMAKE} --gnu --add-missing
+${AUTOCONF}
 
 for sub in libltdl demo depdemo mdemo cdemo tagdemo pdemo; do
   cd $sub
@@ -20,9 +24,9 @@ for sub in libltdl demo depdemo mdemo cdemo tagdemo pdemo; do
   cat ../libtool.m4 > acinclude.m4
   test "$sub" = libltdl && cat ../ltdl.m4 >> acinclude.m4
   aclocal
-  test "$sub" = libltdl && autoheader
-  automake --gnits --add-missing
-  autoconf
+  test "$sub" = libltdl && ${AUTOHEADER}
+  ${AUTOMAKE} --gnits --add-missing
+  ${AUTOCONF}
   cd ..
 done