From b3072b0b3757910eae01c0b47ee80638f6e84cf5 Mon Sep 17 00:00:00 2001
From: Peter Rosin <peda@lysator.liu.se>
Date: Fri, 20 Mar 2009 16:42:25 +0100
Subject: [PATCH] LT_OUTPUT should always create the libtool script.

* libltdl/m4/libtool.m4 (LT_OUTPUT): Make LT_OUTPUT ignore the
--no-create configure option, and assume that the user wants
to use an up-to-date libtool script if the LT_OUTPUT macro is
present.
* tests/early-libtool.at: Make sure we do not regress.

Signed-off-by: Peter Rosin <peda@lysator.liu.se>
---
 ChangeLog              |  9 +++++++++
 libltdl/m4/libtool.m4  | 16 +++++++---------
 tests/early-libtool.at |  4 ++++
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2699a0927..0a4ef3143 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-20  Peter Rosin  <peda@lysator.liu.se>
+
+	LT_OUTPUT should always create the libtool script.
+	* libltdl/m4/libtool.m4 (LT_OUTPUT): Make LT_OUTPUT ignore the
+	--no-create configure option, and assume that the user wants
+	to use an up-to-date libtool script if the LT_OUTPUT macro is
+	present.
+	* tests/early-libtool.at: Make sure we do not regress.
+
 2009-01-26  Peter Rosin  <peda@lysator.liu.se>
 
 	Don't settle for any dumpbin/link program as name lister.
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 8fca51362..477f6e34f 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -677,15 +677,13 @@ chmod +x "$CONFIG_LT"
 # appending to config.log, which fails on DOS, as config.log is still kept
 # open by configure.  Here we exec the FD to /dev/null, effectively closing
 # config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
-  lt_cl_success=:
-  test "$silent" = yes &&
-    lt_config_lt_args="$lt_config_lt_args --quiet"
-  exec AS_MESSAGE_LOG_FD>/dev/null
-  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-  exec AS_MESSAGE_LOG_FD>>config.log
-  $lt_cl_success || AS_EXIT(1)
-fi
+lt_cl_success=:
+test "$silent" = yes &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
 ])# LT_OUTPUT
 
 
diff --git a/tests/early-libtool.at b/tests/early-libtool.at
index 75e26a2f0..7cc40b923 100644
--- a/tests/early-libtool.at
+++ b/tests/early-libtool.at
@@ -222,4 +222,8 @@ LT_AT_EXEC_CHECK([./hell], [0], [stdout])
 AT_CHECK([grep 'Welcome to GNU Hell' stdout], [], [ignore])
 AT_CHECK([grep 'This is not GNU Hello.' stdout], [], [ignore])
 
+# Make sure config.status --recheck updates the libtool script
+rm libtool
+AT_CHECK([$SHELL ./config.status --recheck],[0],[ignore],[ignore])
+
 AT_CLEANUP
-- 
2.47.3