From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 20 Nov 2010 09:34:16 +0000 (+0100)
Subject: Honor $AUTOCONF, $AUTOMAKE in --help output.
X-Git-Tag: v2.4.2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c9aa6dac54372220d367715bf891a6f06c668fd;p=thirdparty%2Flibtool.git

Honor $AUTOCONF, $AUTOMAKE in --help output.

* libltdl/config/getopt.m4sh (func_help): Use $AUTOCONF and
$AUTOMAKE if set, for --version outout.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 609baed1d..6149a388c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-12-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Honor $AUTOCONF, $AUTOMAKE in --help output.
+	* libltdl/config/getopt.m4sh (func_help): Use $AUTOCONF and
+	$AUTOMAKE if set, for --version outout.
+
 	docs: Libtool configuration diagram.
 	* doc/libtool.texi (Integrating libtool): Add diagrams
 	explaining the dependencies between Libtool files.
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index 219674395..e9363bc35 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -592,8 +592,8 @@ func_help ()
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }