FYI: 45-gary-fix-config-status-libtool-generation.patch

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied to HEAD.
- --
~  ())_.  Gary V. Vaughan    gary@(lilith.warpmail.net|gnu.org)
~  ( '/   Research Scientist http://www.oranda.demon.co.uk       ,_())____
~  / )=   GNU Hacker         http://www.gnu.org/software/libtool  \'      `&
`(_~)_   Tech' Author       http://sources.redhat.com/autobook   =`---d__/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQE/uQO7FRMICSmD1gYRAuZiAJ9OVK2Ameu0rcmdNBsoUsTgiZxLKgCfTxRY
mRAy0Jxi350I98n14chbVqE=
=dbR7
-----END PGP SIGNATURE-----

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>
        * 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.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.78
diff -u -p -u -r1.78 Makefile.am
--- Makefile.am 17 Nov 2003 15:49:06 -0000 1.78
+++ Makefile.am 17 Nov 2003 17:16:20 -0000
@@ -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
Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.20
diff -u -p -u -r1.20 libtool.m4
--- m4/libtool.m4 14 Nov 2003 11:12:21 -0000 1.20
+++ m4/libtool.m4 17 Nov 2003 17:16:20 -0000
@@ -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], [],