From d30b465a54bc995680618baf4433256757b700ad Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Tue, 25 Nov 2003 15:48:23 +0000 Subject: [PATCH] * 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. --- ChangeLog | 9 +++++++++ Makefile.am | 1 - bootstrap | 28 ++++++++++++++++++++++++---- configure.ac | 7 +++++-- doc/Makefile.am | 1 - tests/Makefile.am | 2 -- 6 files changed, 38 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba2263fe7..eda6afb94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-11-25 Gary V. Vaughan + + * 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 * tests/defs (func_configure): cdemo, demo and mdemo are shows diff --git a/Makefile.am b/Makefile.am index 47a1130e2..e9214a7d2 100644 --- 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 3f478021d..bf9c6eea9 100755 --- 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 1107500bc..891787f91 100644 --- 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 98824ceef..1d4b5ffad 100644 --- 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 8fcca7331..2e00c6360 100644 --- 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 \ -- 2.47.2