* m4/libtool.m4 (_LT_PROG_LTMAIN): Require ltmain.sh using

using Autoconf's new AC_REQUIRE_AUX_FILE.

diff --git a/ChangeLog b/ChangeLog
index 0e1a0424be56c0d252e316500b0a7071c098d3a6..ddf0769deb82606bd2136f261ac7c4ef7ce43e53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-05  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * m4/libtool.m4 (_LT_PROG_LTMAIN): Require ltmain.sh using
+       using Autoconf's new AC_REQUIRE_AUX_FILE.
+
 2004-08-05  Gary V. Vaughan  <gary@gnu.org>
 
        * Makefile.am ($(top_srcdir)/config/ltmain.sh): Depends on

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index bee3b7e3a9fb7d94787636933fa468d198d51f93..881b20a54d3861fe97f2403b5b93a60504380b4e 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -209,7 +209,8 @@ _LT_CONFIG_COMMANDS
 # `config.status' has no value for ac_aux_dir unless we are using Automake,
 # so we pass a copy along to make sure it has a sensible value anyway.
 AC_DEFUN([_LT_PROG_LTMAIN],
-[_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
 case $ac_aux_dir in
   $srcdir)   ltmain=./ltmain.sh ;;
   $srcdir/*) ltmain=`expr "$ac_aux_dir" : "$srcdir/\(.*\)"`/ltmain.sh ;;