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 609baed1d05d3bfb591ec7994403c6104e9468ff..6149a388c8fcd89791dff79d192dabe2d1300e9a 100644 (file)
--- 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 219674395260647b2e3233b2304dc1e1a71bed94..e9363bc35ec3f43b86196517964ade1291491883 100644 (file)
--- 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
      }