FYI: 82-gary-cleanup-libtoolize-generation.patch

[Gary V. Vaughan]

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

Applied to HEAD:

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>
        * configure.ac (AC_CONFIG_FILES): Generate libtoolize from here.
        * Makefile.am (libtool, libtoolize): These rules are redundant.
        Automake generates better rules for remaking these files.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.98
diff -u -p -u -r1.98 Makefile.am
- --- Makefile.am 6 Feb 2004 14:03:52 -0000 1.98
+++ Makefile.am 6 Feb 2004 14:50:33 -0000
@@ -41,19 +41,9 @@ pkgmacro_DATA = m4/libtool.m4 m4/ltdl.m4
~ # The standalone libtool script, and the libtool distributor.
~ bin_SCRIPTS = libtool libtoolize

- -config_status = $(top_builddir)/config.status
- -
- -libtool: config/ltmain.sh $(top_builddir)/config.status
- -     CONFIG_FILES= CONFIG_HEADERS= CONFIG_COMMANDS=$@ $(SHELL) 
$(config_status)
- -     chmod +x $@
- -
- -libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
- -     CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_COMMANDS= $(SHELL) 
$(config_status)
- -     chmod +x $@
- -
~ # Make sure config.status is regenerated when the version timestamp changes
~ MKSTAMP = $(SHELL) $(top_srcdir)/config/mkstamp
- -$(config_status): stamp-vcl
+$(top_builddir)/config_status: stamp-vcl
~ stamp-vcl: vcl.tmp $(top_srcdir)/ChangeLog
~ vcl.tmp:
~       @dir=.; test -f $$dir/stamp-vcl || dir=$(srcdir); \
@@ -234,7 +224,7 @@ delta-diff: prev-tarball new-tarball
~ ## Unpack the tarballs somewhere to diff them
~       rm -rf delta-diff
~       mkdir delta-diff
- -     
+
~       ofile="../$(PACKAGE)-$(LASTRELEASE)-$(VERSION).diff.gz"; \
~       cd delta-diff \
~       && tar xzf "../$(PACKAGE)-$(LASTRELEASE).tar.gz" \
@@ -248,7 +238,7 @@ delta-diff: prev-tarball new-tarball
~       && rm -f $$ofile.directive

~       rm -rf delta-diff
- -     
+
~ XDELTA = xdelta
~ XDELTA_OPTIONS = --pristine -9

@@ -266,4 +256,3 @@ delta-xdelta: prev-tarball new-tarball g
~       && echo "directory: libtool" > $$ofile.directive \
~       && $(GPG) --clearsign $$ofile.directive \
~       && rm -f $$ofile.directive
- -
Index: configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/configure.ac,v
retrieving revision 1.34
diff -u -p -u -r1.34 configure.ac
- --- configure.ac 6 Feb 2004 14:38:56 -0000 1.34
+++ configure.ac 6 Feb 2004 14:50:33 -0000
@@ -178,6 +178,7 @@ AM_CONDITIONAL(HAVE_RC, [test "x$RC" !=
~ ## Libtool initialisation. ##
~ ## ----------------------- ##
~ AC_CONFIG_FILES([config/ltmain.sh:./ltmain.in])
+AC_CONFIG_FILES([libtoolize], [chmod a+x libtoolize])
~ AC_LIBTOOL_DLOPEN
~ AC_LIBTOOL_WIN32_DLL
~ AC_PROG_LIBTOOL



- --
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://www.oranda.demon.co.uk
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFAI6wqFRMICSmD1gYRAs55AJ0arMu1Tmt1QlEQdOoLpS/Esz8InACdF+fO
1ihu2evWuMUz8G9cjf82avY=
=uTT9
-----END PGP SIGNATURE-----