* libtool.m4 (AC_LIBTOOL_CONFIG): Don't attempt to

make ltmain.sh unless there's an ltmain.in to do it with.
This prevents make/configure loops caused by Automake's
dependency rules.

diff --git a/ChangeLog b/ChangeLog
index 71b2fc951673611b568938d2e695f1aa0a6ab3d9..26d6a054925407d878035232f472fac703786929 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-23  Scott James Remnant  <scott@netsplit.com>
+
+       * libtool.m4 (AC_LIBTOOL_CONFIG): Don't attempt to
+       make ltmain.sh unless there's an ltmain.in to do it with.
+       This prevents make/configure loops caused by Automake's
+       dependency rules.
+
 2004-01-23  Scott James Remnant  <scott@netsplit.com>
 
        * libtoolize.in: Fix libtoolize so the cd command run when

diff --git a/libtool.m4 b/libtool.m4
index cf87364cdcc111b67b60f83cc5ed3a46810a731e..bbcc5f25270180f254138c37f76778ad03fcadc4 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -4306,7 +4306,10 @@ else
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 ])# AC_LIBTOOL_CONFIG