From: Scott James Remnant <scott@netsplit.com>
Date: Fri, 23 Jan 2004 06:06:50 +0000 (+0000)
Subject: * libtool.m4 (AC_LIBTOOL_CONFIG): Don't attempt to
X-Git-Tag: release-1-5-2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc5144b3d45b0e11863b44380550d928f7411b99;p=thirdparty%2Flibtool.git

* 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 71b2fc951..26d6a0549 100644
--- 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 cf87364cd..bbcc5f252 100644
--- 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