From 88f02314b95cf920ca24982ca314fce086c3e1b1 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 11 Jan 2006 16:37:10 +0000 Subject: [PATCH] Make the AUTOCONF etc. commands overridable by the user. --- ChangeLog | 6 ++++++ gnulib-tool | 20 +++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f1095f4f6..4832adc483 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-11 Bruno Haible + + * gnulib-tool (AUTOCONF, ACLOCAL, AUTOMAKE, AUTORECONF): Make + overridable by the user. + Reported by Ralf Wildenhues . + 2006-01-08 Bruno Haible Avoid "ar: no archive members specified" error on MacOS X. diff --git a/gnulib-tool b/gnulib-tool index 9118d942f0..701de28535 100755 --- 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. -- 2.30.2