From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Thu, 5 Aug 2004 09:34:29 +0000 (+0000)
Subject: * m4/libtool.m4 (_LT_PROG_LTMAIN): Require ltmain.sh using
X-Git-Tag: release-1-9b~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8537718bf7545a4cec1776fb2caf4b7f63e8a2ab;p=thirdparty%2Flibtool.git

* 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 0e1a0424b..ddf0769de 100644
--- 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 bee3b7e3a..881b20a54 100644
--- 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 ;;