From d515c73727cd3b56c297a749390687ed38f3aeb9 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 4 Sep 2000 12:12:21 +0000 Subject: [PATCH] * configure.in: Bump version to 2.49b. * Makefile.am (bin_SCRIPTS): Depend upon configure.in. --- ChangeLog | 5 +++++ Makefile.am | 20 +++++++++++++++++++- Makefile.in | 5 +++-- NEWS | 2 +- configure | 12 ++++++------ configure.in | 6 +++--- man/autoconf.1 | 2 +- man/autoheader.1 | 2 +- man/autoreconf.1 | 2 +- man/autoscan.1 | 2 +- man/autoupdate.1 | 2 +- man/ifnames.1 | 2 +- 12 files changed, 43 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9f690c7..6db0c02b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-09-04 Akim Demaille + + * configure.in: Bump version to 2.49b. + * Makefile.am (bin_SCRIPTS): Depend upon configure.in. + 2000-08-11 Akim Demaille Version 2.49a. diff --git a/Makefile.am b/Makefile.am index 90e0da82..39518e92 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,6 +54,10 @@ $(distpkgdataDATA) CLEANFILES = autoconf.m4f \ $(bin_SCRIPTS) +## --------- ## +## INSTALL. ## +## --------- ## + # INSTALL is a special case. Automake seems to have a single name space # for both targets and variables. If we just use INSTALL, then the var # $(INSTALL) is not defined, and the install target fails. @@ -72,7 +76,12 @@ install-data-hook: INSTALL.txt MAINTAINERCLEANFILES = INSTALL.txt -# The scripts. +## ------------- ## +## The scripts. ## +## ------------- ## + +# Follow the version number changes. +$(bin_SCRIPTS): configure.in editsh = sed \ -e 's,@datadir\@,$(pkgdatadir),g' \ @@ -103,6 +112,11 @@ editpl = sed \ chmod +x $@.tmp mv $@.tmp $@ + +## ------------------ ## +## The frozen files. ## +## ------------------ ## + .m4.m4f: $(M4) -I $(srcdir) $(srcdir)/$*.m4 --freeze-state=$*.m4f @@ -112,6 +126,10 @@ common = libm4.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 acversion.m4 \ autoconf.m4f: autoconf.m4 $(common) +## ---------- ## +## Updating. ## +## ---------- ## + wget-update: $(WGET) ftp://ftp.gnu.org/gnu/GNUinfo/standards.texi -O $(srcdir)/doc/standards.texi $(WGET) ftp://ftp.gnu.org/gnu/GNUinfo/make-stds.texi -O $(srcdir)/doc/make-stds.texi diff --git a/Makefile.in b/Makefile.in index 6e6c5846..968270b7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -98,8 +98,6 @@ CLEANFILES = autoconf.m4f $(bin_SCRIPTS) MAINTAINERCLEANFILES = INSTALL.txt -# The scripts. - editsh = sed -e 's,@datadir\@,$(pkgdatadir),g' -e 's,@M4\@,$(M4),g' -e 's,@AWK\@,$(AWK),g' -e 's,@SHELL\@,$(SHELL),g' -e 's,@VERSION\@,$(VERSION),g' -e 's,@PACKAGE\@,$(PACKAGE),g' -e 's,@bindir\@,$(bindir),g' -e 's,@autoconf-name\@,'`echo autoconf | sed '$(transform)'`',g' -e 's,@autoheader-name\@,'`echo autoheader | sed '$(transform)'`',g' @@ -433,6 +431,9 @@ install-data-hook: INSTALL.txt $(INSTALL_DATA) $$d$$p.txt $(DESTDIR)$(pkgdatadir)/$$f; \ done +# Follow the version number changes. +$(bin_SCRIPTS): configure.in + .sh: rm -f $@ $@.tmp $(editsh) $< >$@.tmp diff --git a/NEWS b/NEWS index 3949d4c4..22dc1d3c 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -* Major changes in Autoconf 2.49a -*- outline -*- +* Major changes in Autoconf 2.49b -*- outline -*- ** Lots of bug fixes Way too many for us to spell them out. Check out ChangeLog if you diff --git a/configure b/configure index 88e1ab38..4db3d3b1 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.49a for Autoconf 2.49a. +# Generated by Autoconf 2.49a for Autoconf 2.49b. # # Report bugs to . # @@ -466,7 +466,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat < $0 $ac_configure_args " >&5 @@ -922,7 +922,7 @@ fi PACKAGE=autoconf -VERSION=2.49a +VERSION=2.49b if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run \"make distclean\" there first" >&2; exit 1; } diff --git a/configure.in b/configure.in index 08d6afa8..cad5e66e 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,8 @@ # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.14a) -AC_INIT(Autoconf, 2.49a, bug-autoconf@gnu.org) +AC_PREREQ(2.49a) +AC_INIT(Autoconf, 2.49b, bug-autoconf@gnu.org) AC_CONFIG_SRCDIR(acgeneral.m4) -AM_INIT_AUTOMAKE(autoconf, 2.49a) +AM_INIT_AUTOMAKE(autoconf, 2.49b) # Initialize the test suite. AT_CONFIG(..) diff --git a/man/autoconf.1 b/man/autoconf.1 index 9973b37b..bc317d34 100644 --- a/man/autoconf.1 +++ b/man/autoconf.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.022. -.TH AUTOCONF "1" "August 2000" "GNU autoconf 2.14a" FSF +.TH AUTOCONF "1" "September 2000" "GNU autoconf 2.49b" FSF .SH NAME autoconf \- Generate configuration scripts .SH SYNOPSIS diff --git a/man/autoheader.1 b/man/autoheader.1 index cd6a7fcb..9bb404fe 100644 --- a/man/autoheader.1 +++ b/man/autoheader.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.022. -.TH AUTOHEADER "1" "August 2000" "GNU autoconf 2.14a" FSF +.TH AUTOHEADER "1" "September 2000" "GNU autoconf 2.49b" FSF .SH NAME autoheader \- Create a template header for configure .SH SYNOPSIS diff --git a/man/autoreconf.1 b/man/autoreconf.1 index 79135272..3240378e 100644 --- a/man/autoreconf.1 +++ b/man/autoreconf.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.022. -.TH AUTORECONF "1" "August 2000" "GNU autoconf 2.14a" FSF +.TH AUTORECONF "1" "September 2000" "GNU autoconf 2.49b" FSF .SH NAME autoreconf \- Update generated configuration files .SH SYNOPSIS diff --git a/man/autoscan.1 b/man/autoscan.1 index e4f1e970..7b468116 100644 --- a/man/autoscan.1 +++ b/man/autoscan.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.022. -.TH AUTOSCAN "1" "August 2000" "GNU autoconf 2.14a" FSF +.TH AUTOSCAN "1" "September 2000" "GNU autoconf 2.49b" FSF .SH NAME autoscan \- Generate a preliminary configure.in .SH SYNOPSIS diff --git a/man/autoupdate.1 b/man/autoupdate.1 index bb096f70..11c262d8 100644 --- a/man/autoupdate.1 +++ b/man/autoupdate.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.022. -.TH AUTOUPDATE "1" "August 2000" "GNU autoconf 2.14a" FSF +.TH AUTOUPDATE "1" "September 2000" "GNU autoconf 2.49b" FSF .SH NAME autoupdate \- Update a configure.in to a newer Autoconf .SH SYNOPSIS diff --git a/man/ifnames.1 b/man/ifnames.1 index bc6bf5c0..13d9d061 100644 --- a/man/ifnames.1 +++ b/man/ifnames.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.022. -.TH IFNAMES "1" "August 2000" "GNU autoconf 2.14a" FSF +.TH IFNAMES "1" "September 2000" "GNU autoconf 2.49b" FSF .SH NAME ifnames \- Extract CPP conditionals from a set of files .SH SYNOPSIS