Make the AUTOCONF etc. commands overridable by the user.

diff --git a/ChangeLog b/ChangeLog
index 5f1095f4f6a824a08f91930bede28af5b80788a4..4832adc483e623a5a5a11e37d276df13a52a21ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-11  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (AUTOCONF, ACLOCAL, AUTOMAKE, AUTORECONF): Make
+       overridable by the user.
+       Reported by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.
+
 2006-01-08  Bruno Haible  <bruno@clisp.org>
 
        Avoid "ar: no archive members specified" error on MacOS X.

diff --git a/gnulib-tool b/gnulib-tool
index 9118d942f0c9927f1a6186a6af1e9f22900ed938..701de285355a3164356ec40f35f3aa90e89f9aa8 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-01-11 13:03:25 $'
+cvsdatestamp='$Date: 2006-01-11 16:37:10 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -38,10 +38,20 @@ AUTOCONFPATH=
 # You can set AUTOMAKEPATH to empty if automake 1.9.x is already in your PATH.
 AUTOMAKEPATH=
 
-AUTOCONF="${AUTOCONFPATH}autoconf"
-ACLOCAL="${AUTOMAKEPATH}aclocal"
-AUTOMAKE="${AUTOMAKEPATH}automake"
-AUTORECONF="${AUTOCONFPATH}autoreconf"
+# If you didn't set AUTOCONFPATH and AUTOMAKEPATH, you can also set the
+# variables AUTOCONF, ACLOCAL, AUTOMAKE, AUTORECONF individually.
+if test -z "${AUTOCONF}" || test -n "${AUTOCONFPATH}"; then
+  AUTOCONF="${AUTOCONFPATH}autoconf"
+fi
+if test -z "${ACLOCAL}" || test -n "${AUTOMAKEPATH}"; then
+  ACLOCAL="${AUTOMAKEPATH}aclocal"
+fi
+if test -z "${AUTOMAKE}" || test -n "${AUTOMAKEPATH}"; then
+  AUTOMAKE="${AUTOMAKEPATH}automake"
+fi
+if test -z "${AUTORECONF}" || test -n "${AUTOCONFPATH}"; then
+  AUTORECONF="${AUTOCONFPATH}autoreconf"
+fi
 
 # func_usage
 # outputs to stdout the --help usage message.