From: Gary V. Vaughan <gary@gnu.org>
Date: Mon, 17 Nov 2003 17:20:09 +0000 (+0000)
Subject: * m4/libtool.m4 (AC_LIBTOOL_SETUP): Uncomment call to
X-Git-Tag: release-1-9b~244
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe6fb50bc319de91c8e2b3369fe23006f720a5b8;p=thirdparty%2Flibtool.git

* m4/libtool.m4 (AC_LIBTOOL_SETUP): Uncomment call to
_LT_CONFIG_COMMANDS.
(_LT_AC_TAG_CONFIG, AC_LIBTOOL_CONFIG): Accumulate tag generation
for `config.status' using _LT_CONFIG_SAVE_COMMANDS.  Remove
AC_MSG_NOTICE noise now that libtool is generated by a single
config.status tag.
* Makefile.am (libtool): Specify CONFIG_COMMANDS properly now that
libtool is generated in one pass.
---

diff --git a/ChangeLog b/ChangeLog
index 8beddb9c9..c011d95ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2003-11-17  Gary V. Vaughan  <gary@gnu.org>
 
+	* m4/libtool.m4 (AC_LIBTOOL_SETUP): Uncomment call to
+	_LT_CONFIG_COMMANDS.
+	(_LT_AC_TAG_CONFIG, AC_LIBTOOL_CONFIG): Accumulate tag generation
+	for `config.status' using _LT_CONFIG_SAVE_COMMANDS.  Remove
+	AC_MSG_NOTICE noise now that libtool is generated by a single
+	config.status tag.
+	* Makefile.am (libtool): Specify CONFIG_COMMANDS properly now that
+	libtool is generated in one pass.
+
 	* configure.ac (CONF_SUBDIRS): Make these relative to
 	tests/Makefile.am.
 	(DIST_MAKEFILE_LIST): Adjust to compensate for having removed the
diff --git a/Makefile.am b/Makefile.am
index 4ccffad5f..c248a5eb1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,7 @@ bin_SCRIPTS = libtool libtoolize
 config_status = $(top_builddir)/config.status
 
 libtool: config/ltmain.sh $(top_builddir)/configure
-	CONFIG_FILES= CONFIG_HEADERS= $(SHELL) $(config_status)
+	CONFIG_FILES= CONFIG_HEADERS= CONFIG_COMMANDS=$@ $(SHELL) $(config_status)
 	chmod +x $@
 
 libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 2ca2207c6..f3e13de1e 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -219,7 +219,7 @@ test -z "$pic_mode" && pic_mode=default
 # Use C for the default configuration in the libtool script
 AC_LIBTOOL_LANG_C_CONFIG
 _LT_AC_TAG_CONFIG
-dnl _LT_CONFIG_COMMANDS
+_LT_CONFIG_COMMANDS
 ])# AC_LIBTOOL_SETUP
 
 
@@ -269,8 +269,8 @@ _LT_CONFIG_LIBTOOL_INIT([$2])
 # -------------------
 # Send accumulated output to $CONFIG_STATUS.
 m4_define([_LT_CONFIG_COMMANDS],
-[AC_CONFIG_COMMANDS([libtool-bogus],
-    [_LT_OUTPUT_LIBTOOL_COMMANDS],  [_LT_OUTPUT_LIBTOOL_INIT])
+[AC_CONFIG_COMMANDS([libtool],
+    [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_INIT])
 ])
 
 
@@ -1732,7 +1732,7 @@ m4_define([_LT_AC_TAG_CONFIG],
       m4_exit(1)])
   ])
 
-  AC_CONFIG_COMMANDS([libtool-tags], [
+  _LT_CONFIG_SAVE_COMMANDS([
     _LT_PROG_LTMAIN
     if test -f "$ltmain"; then
       if test ! -f "${ofile}"; then
@@ -3837,7 +3837,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
 # add code to config.status for appending the configuration named by
 # TAGNAME from the matching tagged config vars.
 m4_define([AC_LIBTOOL_CONFIG],
-[AC_CONFIG_COMMANDS([libtool]$1, [
+[_LT_CONFIG_SAVE_COMMANDS([
   # See if we are running on zsh, and set the options which allow our
   # commands through without removal of \ escapes.
   if test -n "${ZSH_VERSION+set}" ; then
@@ -3847,11 +3847,9 @@ m4_define([AC_LIBTOOL_CONFIG],
   m4_if([$1], [],
       [cfgfile="${ofile}T"
       trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-      $rm -f "$cfgfile"
-      AC_MSG_NOTICE([creating $ofile])],
-    [cfgfile="$ofile"
-    AC_MSG_NOTICE([appending configuration tag `$1' to $ofile])
-  ])
+      $rm -f "$cfgfile"],
+    [cfgfile="$ofile"]
+  )
 
   cat <<_LT_EOF >> "$cfgfile"
 m4_if([$1], [],