From: Akim Demaille Date: Tue, 30 Sep 2003 13:02:07 +0000 (+0000) Subject: Bump to 2.57f. X-Git-Tag: AUTOCONF-2.57f~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83424320dc61d6cc11b0fe5a3e5f72315843ea47;p=thirdparty%2Fautoconf.git Bump to 2.57f. --- diff --git a/NEWS b/NEWS index 3d484cda..d7c28c5d 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ -* Major changes in Autoconf 2.57e -*- outline -*- +* Major changes in Autoconf 2.57f -*- outline -*- + +* Major changes in Autoconf 2.57e Released 2003-09-29, by Akim Demaille. diff --git a/config/announce-gen b/config/announce-gen index 01e4047f..6ff0e58d 100755 --- a/config/announce-gen +++ b/config/announce-gen @@ -72,6 +72,47 @@ EOF exit $exit_code; } +sub print_news_deltas ($$$) +{ + my ($news_file, $prev_version, $curr_version) = @_; + + print "\n$news_file\n\n"; + + # Print all lines from $news_file, starting with the first one + # that mentions $curr_version up to but not including + # the first occurrence of $prev_version. + my $in_items; + + open NEWS, '<', $news_file + or die "$ME: $news_file: cannot open for reading: $!\n"; + while (defined (my $line = )) + { + if (! $in_items) + { + # Match lines like this one: + # * Major changes in release 5.0.1: + # but not any other line that starts with a space, *, or -. + $line =~ /^(\* Major changes.*|[^ *-].*)\Q$curr_version\E/o + or next; + $in_items = 1; + print $line; + } + else + { + # Be careful that this regexp cannot match version numbers + # in NEWS items -- they might well say `introduced in 4.5.5', + # and we don't want that to match. + $line =~ /^(\* Major changes.*|[^ *-].*)\Q$prev_version\E/o + and last; + print $line; + } + } + close NEWS; + + $in_items + or die "$ME: $news_file: no matching lines for `$curr_version'\n"; +} + sub print_changelog_deltas ($$) { my ($package_name, $prev_version) = @_; @@ -165,7 +206,7 @@ sub print_changelog_deltas ($$) my $curr_version; my $release_archive_dir; my @url_dir_list; - my $news_file; + my @news_file; GetOptions ( @@ -174,8 +215,8 @@ sub print_changelog_deltas ($$) 'previous-version=s' => \$prev_version, 'current-version=s' => \$curr_version, 'release-archive-directory=s' => \$release_archive_dir, - 'url-directory=s@' => \@url_dir_list, - 'news=s@' => \$news_file, + 'url-directory=s' => \@url_dir_list, + 'news=s@' => \@news_file, help => sub { usage 0 }, version => sub { print "$ME version $VERSION\n"; exit }, @@ -275,7 +316,7 @@ EOF foreach my $meth (qw (md5 sha1)) { - foreach my $f (($tgz, $tbz, $xd)) + foreach my $f ($tgz, $tbz, $xd) { open IN, '<', $f or die "$ME: $f: cannot open for reading: $!\n"; @@ -293,46 +334,29 @@ EOF or die "$ME: $tmp: while writing: $!\n"; chmod 0400, $tmp; # ignore failure - if ($news_file) - { - print "\nNEWS\n\n"; - - # Print all lines from $news_file, starting with the first one - # that mentions $curr_version up to but not including - # the first occurrence of $prev_version. - my $in_items; - open NEWS, '<', $news_file - or die "$ME: $news_file: cannot open for reading: $!\n"; - while (defined (my $line = )) - { - if ( ! $in_items) - { - # Match lines like this one: - # * Major changes in release 5.0.1: - # but not any other line that starts with a space, *, or -. - $line =~ /^(\* Major changes.*|[^ *-].*)\Q$curr_version\E/o - or next; - $in_items = 1; - print $line; - } - else - { - # Be careful that this regexp cannot match version numbers - # in NEWS items -- they might well say `introduced in 4.5.5', - # and we don't want that to match. - $line =~ /^(\* Major changes.*|[^ *-].*)\Q$prev_version\E/o - and last; - print $line; - } - } - close NEWS; - - $in_items - or die "$ME: $news_file: no matching lines for `$curr_version'\n"; - } + print_news_deltas ($_, $prev_version, $curr_version) foreach @news_file; $release_type eq 'major' or print_changelog_deltas ($package_name, $prev_version); exit 0; } + + + +### Setup "GNU" style for perl-mode and cperl-mode. +## Local Variables: +## perl-indent-level: 2 +## perl-continued-statement-offset: 2 +## perl-continued-brace-offset: 0 +## perl-brace-offset: 0 +## perl-brace-imaginary-offset: 0 +## perl-label-offset: -2 +## cperl-indent-level: 2 +## cperl-brace-offset: 0 +## cperl-continued-brace-offset: 0 +## cperl-label-offset: -2 +## cperl-extra-newline-before-brace: t +## cperl-merge-trailing-else: nil +## cperl-continued-statement-offset: 2 +## End: diff --git a/configure b/configure index 385bad83..45341a06 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57c for GNU Autoconf 2.57e. +# Generated by GNU Autoconf 2.57e for GNU Autoconf 2.57f. # # Report bugs to . # @@ -219,6 +219,7 @@ rm -f conf$$ conf$$.exe conf$$.file if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + rm -fr ./-p as_mkdir_p=false fi @@ -267,8 +268,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='GNU Autoconf' PACKAGE_TARNAME='autoconf' -PACKAGE_VERSION='2.57e' -PACKAGE_STRING='GNU Autoconf 2.57e' +PACKAGE_VERSION='2.57f' +PACKAGE_STRING='GNU Autoconf 2.57f' PACKAGE_BUGREPORT='bug-autoconf@gnu.org' ac_unique_file="ChangeLog" @@ -729,7 +730,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 <<_ACEOF -\`configure' configures GNU Autoconf 2.57e to adapt to many kinds of systems. +\`configure' configures GNU Autoconf 2.57f to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -791,7 +792,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Autoconf 2.57e:";; + short | recursive ) echo "Configuration of GNU Autoconf 2.57f:";; esac cat <<\_ACEOF @@ -871,8 +872,8 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -GNU Autoconf configure 2.57e -generated by GNU Autoconf 2.57c +GNU Autoconf configure 2.57f +generated by GNU Autoconf 2.57e Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -885,8 +886,8 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU Autoconf $as_me 2.57e, which was -generated by GNU Autoconf 2.57c. Invocation command line was +It was created by GNU Autoconf $as_me 2.57f, which was +generated by GNU Autoconf 2.57e. Invocation command line was $ $0 $@ @@ -1500,7 +1501,7 @@ fi # Define the identity of the package. PACKAGE='autoconf' - VERSION='2.57e' + VERSION='2.57f' cat >>confdefs.h <<_ACEOF @@ -2315,6 +2316,7 @@ rm -f conf$$ conf$$.exe conf$$.file if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + rm -fr ./-p as_mkdir_p=false fi @@ -2350,8 +2352,8 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by GNU Autoconf $as_me 2.57e, which was -generated by GNU Autoconf 2.57c. Invocation command line was +This file was extended by GNU Autoconf $as_me 2.57f, which was +generated by GNU Autoconf 2.57e. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -2408,8 +2410,8 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -GNU Autoconf config.status 2.57e -configured by $0, generated by GNU Autoconf 2.57c, +GNU Autoconf config.status 2.57f +configured by $0, generated by GNU Autoconf 2.57e, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2003 Free Software Foundation, Inc. diff --git a/configure.ac b/configure.ac index 50da5878..1838c5ca 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ # We need AC_CONFIG_TESTDIR. AC_PREREQ([2.57]) -AC_INIT([GNU Autoconf], [2.57e], [bug-autoconf@gnu.org]) +AC_INIT([GNU Autoconf], [2.57f], [bug-autoconf@gnu.org]) AC_SUBST([PACKAGE_NAME])dnl AC_CONFIG_SRCDIR([ChangeLog]) diff --git a/man/autoconf.1 b/man/autoconf.1 index 80c812f8..33602ef1 100644 --- a/man/autoconf.1 +++ b/man/autoconf.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. -.TH AUTOCONF "1" "September 2003" "autoconf 2.57e" "User Commands" +.TH AUTOCONF "1" "September 2003" "autoconf 2.57f" "User Commands" .SH NAME autoconf \- Generate configuration scripts .SH SYNOPSIS diff --git a/man/autoheader.1 b/man/autoheader.1 index 43f79b8d..3219b828 100644 --- a/man/autoheader.1 +++ b/man/autoheader.1 @@ -73,7 +73,7 @@ Written by Roland McGrath and Akim Demaille. .SH "REPORTING BUGS" Report bugs to . .PP -autoheader (GNU Autoconf) 2.57e +autoheader (GNU Autoconf) 2.57f .SH COPYRIGHT Copyright \(co 2003 Free Software Foundation, Inc. .br diff --git a/man/autom4te.1 b/man/autom4te.1 index ef23dadf..775cac58 100644 --- a/man/autom4te.1 +++ b/man/autom4te.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. -.TH AUTOM4TE "1" "September 2003" "autom4te 2.57e" "User Commands" +.TH AUTOM4TE "1" "September 2003" "autom4te 2.57f" "User Commands" .SH NAME autom4te \- Generate files and scripts thanks to M4 .SH SYNOPSIS diff --git a/man/autoreconf.1 b/man/autoreconf.1 index 5e768340..017f39f9 100644 --- a/man/autoreconf.1 +++ b/man/autoreconf.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. -.TH AUTORECONF "1" "September 2003" "autoreconf 2.57e" "User Commands" +.TH AUTORECONF "1" "September 2003" "autoreconf 2.57f" "User Commands" .SH NAME autoreconf \- Update generated configuration files .SH SYNOPSIS diff --git a/man/autoscan.1 b/man/autoscan.1 index a8ddbfa8..3c33ad2e 100644 --- a/man/autoscan.1 +++ b/man/autoscan.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. -.TH AUTOSCAN "1" "September 2003" "autoscan 2.57e" "User Commands" +.TH AUTOSCAN "1" "September 2003" "autoscan 2.57f" "User Commands" .SH NAME autoscan \- Generate a preliminary configure.in .SH SYNOPSIS diff --git a/man/autoupdate.1 b/man/autoupdate.1 index 027b34f7..632849d0 100644 --- a/man/autoupdate.1 +++ b/man/autoupdate.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. -.TH AUTOUPDATE "1" "September 2003" "autoupdate 2.57e" "User Commands" +.TH AUTOUPDATE "1" "September 2003" "autoupdate 2.57f" "User Commands" .SH NAME autoupdate \- Update a configure.in to a newer Autoconf .SH SYNOPSIS diff --git a/man/ifnames.1 b/man/ifnames.1 index 02b46bdd..3b9a4d4a 100644 --- a/man/ifnames.1 +++ b/man/ifnames.1 @@ -22,7 +22,7 @@ Written by David J. MacKenzie and Paul Eggert. .SH "REPORTING BUGS" Report bugs to . .PP -ifnames (GNU Autoconf) 2.57e +ifnames (GNU Autoconf) 2.57f .SH COPYRIGHT Copyright \(co 2003 Free Software Foundation, Inc. .br