* m4/libtool.m4 (_LT_PROG_LTMAIN): Simplified in light of

ltmain.sh no longer being in the build tree.
Reported by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 3956f5f67d200cd618fc4be3324193292426ec18..4b2839c3a98d00e5daf0bb3a0c555b1e3c0b13b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-01  Gary V. Vaughan  <gary@gnu.org>
+
+       * m4/libtool.m4 (_LT_PROG_LTMAIN): Simplified in light of
+       ltmain.sh no longer being in the build tree.
+       Reported by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
 2004-09-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * libltdl/loaders/preopen.c: Initialise memory in get_vtable.

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 633eb67d65ba8762e914c301d03781ffb61b6b51..a0b273f4c487a64c7d2ce266897afe86941a8081 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -200,10 +200,6 @@ _LT_CONFIG_COMMANDS
 
 # _LT_PROG_LTMAIN
 # ---------------
-# In libtool itself `ltmain.sh' is in the build tree, but everything else
-# ships it in the source tree, for completeness, if we find a copy in the
-# build tree use that before falling back to auxdir.
-#
 # Note that this code is called both from `configure', and `config.status'
 # now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
 # `config.status' has no value for ac_aux_dir unless we are using Automake,
@@ -211,11 +207,7 @@ _LT_CONFIG_COMMANDS
 m4_defun([_LT_PROG_LTMAIN],
 [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 ;;
-esac
-test -f "$ltmain" || ltmain="$ac_aux_dir/ltmain.sh"
+ltmain="$ac_aux_dir/ltmain.sh"
 ])# _LT_PROG_LTMAIN