FYI: 51-gary-honest-dependency-info.patch

[Gary V. Vaughan]

Applied to HEAD.
--
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

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>

        * bootstrap: Explain automake and autoconf version dependencies
        truthfully, and the difference between bootstrap and user
        dependencies.
        * configure.ac (AM_INIT_AUTOMAKE): List AUTOMAKE_OPTIONS here.
        * Makefile.am, doc/Makefile.am, tests/Makefile.am
        (AUTOMAKE_OPTIONS): Removed from here.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.80
diff -u -p -u -r1.80 Makefile.am
--- Makefile.am 22 Nov 2003 10:03:12 -0000 1.80
+++ Makefile.am 25 Nov 2003 15:47:09 -0000
@@ -17,7 +17,6 @@
 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ## Boston, MA 02111-1307, USA.
 
-AUTOMAKE_OPTIONS = 1.7 gnu
 ACLOCAL_AMFLAGS  = -I m4
 
 BUILD_SUBDIRS = . libltdl doc tests
Index: bootstrap
===================================================================
RCS file: /cvsroot/libtool/libtool/bootstrap,v
retrieving revision 1.33
diff -u -p -u -r1.33 bootstrap
--- bootstrap 21 Oct 2003 09:28:38 -0000 1.33
+++ bootstrap 25 Nov 2003 15:47:09 -0000
@@ -1,10 +1,30 @@
 #! /bin/sh
+# bootstrap -- Helps bootstrapping libtool, when checked out from CVS.
+#
+# Copyright (C) 2003 Free Software Foundation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
-# Helps bootstrapping libtool, when checked out from CVS
-# requires at least GNU autoconf 2.58 and GNU automake 1.8.
-
-# Upgrade caveat.
+# It is okay for the bootstrap process to require unreleased autoconf
+# or automake, as long as any released libtool will work with at least
+# the newest stable versions of each.  Generally, newer versions offer
+# better features, and configure.ac documents oldest version of each
+# required for bootstrap (AC_PREREQ, and AM_INIT_AUTOMAKE).
 
+# Upgrade caveat:
 cat <<'EOF'
 WARNING: If bootstrapping with this script fails, it may be due to an
 WARNING: incompatible installed `libtool.m4' being pulled in to
Index: configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/configure.ac,v
retrieving revision 1.25
diff -u -p -u -r1.25 configure.ac
--- configure.ac 22 Nov 2003 10:03:13 -0000 1.25
+++ configure.ac 25 Nov 2003 15:47:09 -0000
@@ -18,7 +18,7 @@
 
 
 AC_PREREQ(2.58) ## We use AS_HELP_STRING
-
+## Oldest automake required for bootstrap is below in AM_INIT_AUTOMAKE.
 
 
 ## ------------------------ ##
@@ -106,7 +106,10 @@ AC_SUBST([TIMESTAMP])
 ## ------------------------ ##
 ## Automake Initialisation. ##
 ## ------------------------ ##
-AM_INIT_AUTOMAKE
+
+dnl These are bootstrap requirements, once built, libtool may work with
+dnl much older releases of autoconf and automake.  See release notes.
+AM_INIT_AUTOMAKE([1.7 gnits])
 
 
 ## ------------------------------- ##
Index: doc/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/doc/Makefile.am,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile.am
--- doc/Makefile.am 8 Apr 2001 00:29:06 -0000 1.3
+++ doc/Makefile.am 25 Nov 2003 15:47:09 -0000
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = gnits
 info_TEXINFOS = libtool.texi
 libtool_TEXINFOS = PLATFORMS fdl.texi
Index: tests/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/Makefile.am,v
retrieving revision 1.36
diff -u -p -u -r1.36 Makefile.am
--- tests/Makefile.am 17 Nov 2003 15:49:06 -0000 1.36
+++ tests/Makefile.am 25 Nov 2003 15:47:09 -0000
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = gnits
-
 CXX_TESTS = \
        tagdemo-static.test tagdemo-make.test tagdemo-exec.test \
        tagdemo-conf.test tagdemo-make.test tagdemo-exec.test \

pgpZhLGXKrjsw.pgp
Description: PGP signature