* 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.

diff --git a/ChangeLog b/ChangeLog
index ba2263fe7475dd179de280d6294437c9502bf5f9..eda6afb94685c5aae7fa6bcf310ba463af13b655 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-25  Gary V. Vaughan  <gary@gnu.org>
+
+       * 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.
+
 2003-11-24  Gary V. Vaughan  <gary@gnu.org>
 
        * tests/defs (func_configure): cdemo, demo and mdemo are shows

diff --git a/Makefile.am b/Makefile.am
index 47a1130e25af5a732a9706ae4a56f5dfdb174c4f..e9214a7d26472c8a0191a808bcac654a656cd1f3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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

diff --git a/bootstrap b/bootstrap
index 3f478021d54595c88fb69bf84640bc27f6c22b55..bf9c6eea997732fbcbae081a630fff51a4f4864a 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -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

diff --git a/configure.ac b/configure.ac
index 1107500bc8368197496a4c752f08108318c39464..891787f91b02a454a7e006713ef7ffff345e57ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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])
 
 
 ## ------------------------------- ##

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 98824ceefdaa68306d10c5453baf302cb7da4518..1d4b5ffad2e21aeed37a078fd956ec4e4a6b95c9 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8fcca733195aeb29638063f1e85e64edcab1b043..2e00c6360de09ddbed2ea50e6ad871afdef2febc 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -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 \