[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Autoconf source repository branch, master, updated. v2.64-13-g
|
From: |
Eric Blake |
|
Subject: |
[SCM] GNU Autoconf source repository branch, master, updated. v2.64-13-g1c69422 |
|
Date: |
Fri, 14 Aug 2009 13:34:13 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".
http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=1c69422d88f5631e56012eb7e884cdd34a4236f8
The branch, master has been updated
via 1c69422d88f5631e56012eb7e884cdd34a4236f8 (commit)
via f2b17001accafe0c7d159d5e18c963c3622d23ed (commit)
from c6aa493da470a5f2578508632058188e81a91af6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1c69422d88f5631e56012eb7e884cdd34a4236f8
Author: Eric Blake <address@hidden>
Date: Fri Aug 14 07:31:43 2009 -0600
Update copyright.
* AUTHORS: Include 2009 in copyright.
* lib/Autom4te/C4che.pm: Likewise.
* lib/Autom4te/Channels.pm: Likewise.
* lib/Autom4te/Configure_ac.pm: Likewise.
* lib/Autom4te/FileUtils.pm: Likewise.
* lib/Autom4te/General.pm: Likewise.
* lib/Autom4te/Request.pm: Likewise.
* lib/Autom4te/Struct.pm: Likewise.
* lib/autoconf/Makefile.am: Likewise.
* lib/autoconf/autoconf.m4: Likewise.
* lib/autoconf/autoscan.m4: Likewise.
* lib/autoconf/autoupdate.m4: Likewise.
* lib/autoconf/functions.m4: Likewise.
* lib/autoconf/libs.m4: Likewise.
* lib/autoconf/oldnames.m4: Likewise.
* lib/autoconf/types.m4: Likewise.
* lib/autoscan/Makefile.am: Likewise.
* lib/autoscan/autoscan.pre: Likewise.
* lib/autotest/Makefile.am: Likewise.
* lib/autotest/autotest.m4: Likewise.
* lib/emacs/autoconf-mode.el: Likewise.
* lib/emacs/autotest-mode.el: Likewise.
* lib/freeze.mk: Likewise.
* lib/m4sugar/foreach.m4: Likewise.
* man/Makefile.am: Likewise.
* tests/atlocal.in: Likewise.
* tests/autoscan.at: Likewise.
* tests/foreign.at: Likewise.
* tests/fortran.at: Likewise.
* tests/mktests.sh: Likewise.
* tests/semantics.at: Likewise.
* tests/suite.at: Likewise.
* tests/wrapper.as: Likewise.
Signed-off-by: Eric Blake <address@hidden>
commit f2b17001accafe0c7d159d5e18c963c3622d23ed
Author: Eric Blake <address@hidden>
Date: Wed Aug 12 14:25:53 2009 -0600
Prepare to bulk update copyright years.
* build-aux/update-copyright: New file.
* cfg.mk (gnulib-update): Sync it from gnulib.
(update-copyright-exclude-regexp): New varialbe.
(web-manual): Move...
* maint.mk (web-manual): ...here, to match gnulib.
(update-copyright): New target, copied from gnulib's
maint.mk (it would be nice to sync this file...).
(build_aux): New macro.
(VC_LIST, emit_upload_commands): Use it.
* build-aux/texinfo.tex: Resynchronize from upstream.
* lib/autoconf/general.m4 (_AC_COPYRIGHT_YEARS): Reformat to meet
expected pattern.
* lib/autotest/general.m4 (_AT_COPYRIGHT_YEARS): Likewise.
Signed-off-by: Eric Blake <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 2 +-
ChangeLog | 52 +++++++++
build-aux/texinfo.tex | 3 +-
build-aux/update-copyright | 246 ++++++++++++++++++++++++++++++++++++++++++
cfg.mk | 18 ++--
lib/Autom4te/C4che.pm | 2 +-
lib/Autom4te/Channels.pm | 3 +-
lib/Autom4te/Configure_ac.pm | 3 +-
lib/Autom4te/FileUtils.pm | 2 +-
lib/Autom4te/General.pm | 2 +-
lib/Autom4te/Request.pm | 2 +-
lib/Autom4te/Struct.pm | 3 +-
lib/autoconf/Makefile.am | 2 +-
lib/autoconf/autoconf.m4 | 4 +-
lib/autoconf/autoscan.m4 | 2 +-
lib/autoconf/autoupdate.m4 | 2 +-
lib/autoconf/functions.m4 | 4 +-
lib/autoconf/general.m4 | 7 +-
lib/autoconf/libs.m4 | 3 +-
lib/autoconf/oldnames.m4 | 3 +-
lib/autoconf/types.m4 | 4 +-
lib/autoscan/Makefile.am | 2 +-
lib/autoscan/autoscan.pre | 2 +-
lib/autotest/Makefile.am | 2 +-
lib/autotest/autotest.m4 | 2 +-
lib/autotest/general.m4 | 7 +-
lib/emacs/autoconf-mode.el | 2 +-
lib/emacs/autotest-mode.el | 2 +-
lib/freeze.mk | 3 +-
lib/m4sugar/foreach.m4 | 2 +-
maint.mk | 31 +++++-
man/Makefile.am | 3 +-
tests/atlocal.in | 3 +-
tests/autoscan.at | 2 +-
tests/foreign.at | 4 +-
tests/fortran.at | 3 +-
tests/mktests.sh | 4 +-
tests/semantics.at | 4 +-
tests/suite.at | 3 +-
tests/wrapper.as | 2 +-
40 files changed, 396 insertions(+), 56 deletions(-)
create mode 100755 build-aux/update-copyright
diff --git a/AUTHORS b/AUTHORS
index aac3f00..09854ed 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -100,7 +100,7 @@ mode: text
coding: utf-8
End:
-Copyright (C) 1996, 2000, 2001, 2005, 2007, 2008 Free Software
+Copyright (C) 1996, 2000, 2001, 2005, 2007, 2008, 2009 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/ChangeLog b/ChangeLog
index 430c6fa..3baf7a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,55 @@
+2009-08-14 Eric Blake <address@hidden>
+
+ Update copyright.
+ * AUTHORS: Include 2009 in copyright.
+ * lib/Autom4te/C4che.pm: Likewise.
+ * lib/Autom4te/Channels.pm: Likewise.
+ * lib/Autom4te/Configure_ac.pm: Likewise.
+ * lib/Autom4te/FileUtils.pm: Likewise.
+ * lib/Autom4te/General.pm: Likewise.
+ * lib/Autom4te/Request.pm: Likewise.
+ * lib/Autom4te/Struct.pm: Likewise.
+ * lib/autoconf/Makefile.am: Likewise.
+ * lib/autoconf/autoconf.m4: Likewise.
+ * lib/autoconf/autoscan.m4: Likewise.
+ * lib/autoconf/autoupdate.m4: Likewise.
+ * lib/autoconf/functions.m4: Likewise.
+ * lib/autoconf/libs.m4: Likewise.
+ * lib/autoconf/oldnames.m4: Likewise.
+ * lib/autoconf/types.m4: Likewise.
+ * lib/autoscan/Makefile.am: Likewise.
+ * lib/autoscan/autoscan.pre: Likewise.
+ * lib/autotest/Makefile.am: Likewise.
+ * lib/autotest/autotest.m4: Likewise.
+ * lib/emacs/autoconf-mode.el: Likewise.
+ * lib/emacs/autotest-mode.el: Likewise.
+ * lib/freeze.mk: Likewise.
+ * lib/m4sugar/foreach.m4: Likewise.
+ * man/Makefile.am: Likewise.
+ * tests/atlocal.in: Likewise.
+ * tests/autoscan.at: Likewise.
+ * tests/foreign.at: Likewise.
+ * tests/fortran.at: Likewise.
+ * tests/mktests.sh: Likewise.
+ * tests/semantics.at: Likewise.
+ * tests/suite.at: Likewise.
+ * tests/wrapper.as: Likewise.
+
+ Prepare to bulk update copyright years.
+ * build-aux/update-copyright: New file.
+ * cfg.mk (gnulib-update): Sync it from gnulib.
+ (update-copyright-exclude-regexp): New varialbe.
+ (web-manual): Move...
+ * maint.mk (web-manual): ...here, to match gnulib.
+ (update-copyright): New target, copied from gnulib's
+ maint.mk (it would be nice to sync this file...).
+ (build_aux): New macro.
+ (VC_LIST, emit_upload_commands): Use it.
+ * build-aux/texinfo.tex: Resynchronize from upstream.
+ * lib/autoconf/general.m4 (_AC_COPYRIGHT_YEARS): Reformat to meet
+ expected pattern.
+ * lib/autotest/general.m4 (_AT_COPYRIGHT_YEARS): Likewise.
+
2009-08-12 Paolo Bonzini <address@hidden>
Fix testsuite log capturing for tests 183 and 186.
diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
index 4592fbb..3b44d40 100644
--- a/build-aux/texinfo.tex
+++ b/build-aux/texinfo.tex
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2009-05-24.17}
+\def\texinfoversion{2009-07-25.15}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4322,6 +4322,7 @@ end
\definedummyword\code
\definedummyword\command
\definedummyword\dfn
+ \definedummyword\email
\definedummyword\emph
\definedummyword\env
\definedummyword\file
diff --git a/build-aux/update-copyright b/build-aux/update-copyright
new file mode 100755
index 0000000..d8445fe
--- /dev/null
+++ b/build-aux/update-copyright
@@ -0,0 +1,246 @@
+#!/usr/bin/perl -0777 -pi
+# Update an FSF copyright year list to include the current year.
+
+my $VERSION = '2009-08-14.05:03'; # UTC
+
+# Copyright (C) 2009 Free Software Foundation, Inc.
+#
+# 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 3, 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. If not, see <http://www.gnu.org/licenses/>.
+
+# Written by Jim Meyering and Joel E. Denny
+
+# The arguments to this script should be names of files that contain FSF
+# copyright statements to be updated. For example, you might wish to
+# use the update-copyright target rule in maint.mk from gnulib's
+# maintainer-makefile module.
+#
+# Iff an FSF copyright statement is discovered in a file and the final
+# year is not the current year, then the statement is updated for the
+# new year, 2-digit years are converted to 4-digit years by prepending
+# "19", and the statement is reformatted to fit within 72 columns. A
+# warning is printed for every file for which no FSF copyright statement
+# is discovered.
+#
+# Each file's FSF copyright statement must be formated correctly in
+# order to be recognized. For example, each of these is fine:
+#
+# Copyright @copyright{} 1990-2005, 2007-2009 Free Software
+# Foundation, Inc.
+#
+# # Copyright (C) 1990-2005, 2007-2009 Free Software
+# # Foundation, Inc.
+#
+# /*
+# * Copyright © 90,2005,2007-2009
+# * Free Software Foundation, Inc.
+# */
+#
+# However, the following format is not recognized because the line
+# prefix changes after the first line:
+#
+# ## Copyright (C) 1990-2005, 2007-2009 Free Software
+# # Foundation, Inc.
+#
+# The following copyright statement is not recognized because the
+# copyright holder is not the FSF:
+#
+# Copyright (C) 1990-2005, 2007-2009 Acme, Inc.
+#
+# However, any correctly formatted FSF copyright statement following
+# either of the previous two copyright statements would be recognized.
+#
+# The exact conditions that a file's FSF copyright statement must meet
+# to be recognized are:
+#
+# 1. It is the first FSF copyright statement that meets all of the
+# following conditions. Subsequent FSF copyright statements are
+# ignored.
+# 2. Its format is "Copyright (C)", then a list of copyright years,
+# and then the name of the copyright holder, which is "Free
+# Software Foundation, Inc.".
+# 3. The "(C)" takes one of the following forms or is omitted
+# entirely:
+#
+# A. (C)
+# B. (c)
+# C. @copyright{}
+# D. ©
+#
+# 4. The "Copyright" appears at the beginning of a line except that it
+# may be prefixed by any sequence (e.g., a comment) of no more than
+# 5 characters.
+# 5. Iff such a prefix is present, the same prefix appears at the
+# beginning of each remaining line within the FSF copyright
+# statement. There is one exception in order to support C-style
+# comments: if the first line's prefix contains nothing but
+# whitespace surrounding a "/*", then the prefix for all subsequent
+# lines is the same as the first line's prefix except with each of
+# "/" and possibly "*" replaced by a " ". The replacement of "*"
+# by " " is consistent throughout all subsequent lines.
+# 6. Blank lines, even if preceded by the prefix, do not appear
+# within the FSF copyright statement.
+# 7. Each copyright year is 2 or 4 digits, and years are separated by
+# commas or dashes. Whitespace may occur after commas.
+#
+# Environment variables:
+#
+# 1. If UPDATE_COPYRIGHT_USE_INTERVALS=1, every series of consecutive
+# copyright years (such as 90, 1991, 1992-2007, 2008) in an updated
+# FSF copyright statement is collapsed to a single interval (such
+# as 1990-2008). If unset or set to 0, all existing copyright year
+# intervals are expanded.
+# 2. For testing purposes, you can set the assumed current year in
+# UPDATE_COPYRIGHT_YEAR.
+
+use strict;
+use warnings;
+
+my $copyright_re = 'Copyright';
+my $circle_c_re = '(?:\([cC]\)|@copyright{}|©)';
+my $holder = 'Free Software Foundation, Inc.';
+my $prefix_max = 5;
+my $margin = 72;
+my $tab_width = 8;
+
+my $this_year = $ENV{UPDATE_COPYRIGHT_YEAR};
+if (!$this_year || $this_year !~ m/^\d{4}$/)
+ {
+ my ($sec, $min, $hour, $mday, $month, $year) = localtime (time ());
+ $this_year = $year + 1900;
+ }
+
+# Unless the file consistently uses "\r\n" as the EOL, use "\n" instead.
+my $eol = /(?:^|[^\r])\n/ ? "\n" : "\r\n";
+
+my $leading;
+my $prefix;
+my $ws_re;
+my $stmt_re;
+while (/(^|\n)(.{0,$prefix_max})$copyright_re/g)
+ {
+ $leading = "$1$2";
+ $prefix = $2;
+ if ($prefix =~ /^(\s*\/)\*(\s*)$/)
+ {
+ $prefix =~ s,/, ,;
+ my $prefix_ws = $prefix;
+ $prefix_ws =~ s/\*/ /; # Only whitespace.
+ if (/\G(?:[^*\n]|\*[^\/\n])*\*?\n$prefix_ws/)
+ {
+ $prefix = $prefix_ws;
+ }
+ }
+ $ws_re = '[ \t\r\f]'; # \s without \n
+ $ws_re =
+ "(?:$ws_re*(?:$ws_re|\\n" . quotemeta($prefix) . ")$ws_re*)";
+ my $holder_re = $holder;
+ $holder_re =~ s/\s/$ws_re/g;
+ my $stmt_remainder_re =
+ "(?:$ws_re$circle_c_re)?"
+ . "$ws_re(?:(?:\\d\\d)?\\d\\d(?:,$ws_re?|-))*"
+ . "((?:\\d\\d)?\\d\\d)$ws_re$holder_re";
+ if (/\G$stmt_remainder_re/)
+ {
+ $stmt_re =
+ quotemeta($leading) . "($copyright_re$stmt_remainder_re)";
+ last;
+ }
+ }
+if (defined $stmt_re)
+ {
+ /$stmt_re/ or die; # Should never die.
+ my $stmt = $1;
+ my $final_year_orig = $2;
+
+ # Handle two-digit year numbers like "98" and "99".
+ my $final_year = $final_year_orig;
+ $final_year <= 99
+ and $final_year += 1900;
+
+ if ($final_year != $this_year)
+ {
+ # Update the year.
+ $stmt =~ s/$final_year_orig/$final_year, $this_year/;
+
+ # Normalize all whitespace including newline-prefix sequences.
+ $stmt =~ s/$ws_re/ /g;
+
+ # Put spaces after commas.
+ $stmt =~ s/, ?/, /g;
+
+ # Convert 2-digit to 4-digit years.
+ $stmt =~ s/(\b\d\d\b)/19$1/g;
+
+ # Make the use of intervals consistent.
+ if (!$ENV{UPDATE_COPYRIGHT_USE_INTERVALS})
+ {
+ $stmt =~ s/(\d{4})-(\d{4})/join(', ', $1..$2)/eg;
+ }
+ else
+ {
+ $stmt =~
+ s/
+ (\d{4})
+ (?:
+ (,\ |-)
+ ((??{
+ if ($2 eq '-') { '\d{4}'; }
+ elsif (!$3) { $1 + 1; }
+ else { $3 + 1; }
+ }))
+ )+
+ /$1-$3/gx;
+ }
+
+ # Format within margin.
+ my $stmt_wrapped;
+ my $text_margin = $margin - length($prefix);
+ if ($prefix =~ /^(\t+)/)
+ {
+ $text_margin -= length($1) * ($tab_width - 1);
+ }
+ while (length $stmt)
+ {
+ if (($stmt =~ s/^(.{1,$text_margin})(?: |$)//)
+ || ($stmt =~ s/^([\S]+)(?: |$)//))
+ {
+ my $line = $1;
+ $stmt_wrapped .= $stmt_wrapped ? "$eol$prefix" : $leading;
+ $stmt_wrapped .= $line;
+ }
+ else
+ {
+ # Should be unreachable, but we don't want an infinite
+ # loop if it can be reached.
+ die;
+ }
+ }
+
+ # Replace the old copyright statement.
+ s/$stmt_re/$stmt_wrapped/;
+ }
+ }
+else
+ {
+ print STDERR "$ARGV: warning: FSF copyright statement not found\n";
+ }
+
+# Local variables:
+# indent-tabs-mode: nil
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "my $VERSION = '"
+# time-stamp-format: "%:y-%02m-%02d.%02H:%02M"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "'; # UTC"
+# End:
diff --git a/cfg.mk b/cfg.mk
index 07da748..deb8c69 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -33,6 +33,9 @@ gnu_ftp_host-beta = alpha.gnu.org
gnu_ftp_host-major = ftp.gnu.org
gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
+# Used in maint.mk's web-manual rule
+manual_title = Creating Automatic Configuration Scripts
+
url_dir_list = \
ftp://$(gnu_rel_host)/gnu/autoconf
@@ -59,8 +62,9 @@ gnulib-update:
cp $(gnulib_dir)/build-aux/mdate-sh $(srcdir)/build-aux
cp $(gnulib_dir)/build-aux/missing $(srcdir)/build-aux
cp $(gnulib_dir)/build-aux/move-if-change $(srcdir)/build-aux
- cp $(gnulib_dir)/build-aux/vc-list-files $(srcdir)/build-aux
cp $(gnulib_dir)/build-aux/texinfo.tex $(srcdir)/build-aux
+ cp $(gnulib_dir)/build-aux/update-copyright $(srcdir)/build-aux
+ cp $(gnulib_dir)/build-aux/vc-list-files $(srcdir)/build-aux
cp $(gnulib_dir)/doc/fdl.texi $(srcdir)/doc
cp $(gnulib_dir)/doc/gendocs_template $(srcdir)/doc
cp $(gnulib_dir)/doc/gnu-oids.texi $(srcdir)/doc
@@ -105,10 +109,8 @@ autom4te-update:
local-checks-to-skip ?= \
changelog-check sc_unmarked_diagnostics
-.PHONY: web-manual
-web-manual:
- @cd $(srcdir)/doc ; \
- $(SHELL) ../build-aux/gendocs.sh -o '$(abs_builddir)/doc/manual' \
- --email $(PACKAGE_BUGREPORT) $(PACKAGE) \
- "$(PACKAGE_NAME) - Creating Automatic Configuration Scripts"
- @echo " *** Upload the doc/manual directory to web-cvs."
+# Don't adjust copyright in upstream files.
+update-copyright-exclude-regexp = \
+(^|/)(COPYING|build-aux/|GNUmakefile\
+|Autom4te/(Configure_ac|Channels|FileUtils|Struct|XFile)\
+|doc/(fdl|gendocs|gnu-oids|make-stds|standards)).*$$
diff --git a/lib/Autom4te/C4che.pm b/lib/Autom4te/C4che.pm
index aa8e6e9..c28cfd5 100644
--- a/lib/Autom4te/C4che.pm
+++ b/lib/Autom4te/C4che.pm
@@ -1,5 +1,5 @@
# autoconf -- create `configure' using m4 macros
-# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 2009 Free Software Foundation, Inc.
# 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
diff --git a/lib/Autom4te/Channels.pm b/lib/Autom4te/Channels.pm
index 1309d20..86723ee 100644
--- a/lib/Autom4te/Channels.pm
+++ b/lib/Autom4te/Channels.pm
@@ -1,4 +1,5 @@
-# Copyright (C) 2002, 2004, 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2006, 2008, 2009 Free Software Foundation,
+# Inc.
# 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
diff --git a/lib/Autom4te/Configure_ac.pm b/lib/Autom4te/Configure_ac.pm
index fba4bce..fe39bc7 100644
--- a/lib/Autom4te/Configure_ac.pm
+++ b/lib/Autom4te/Configure_ac.pm
@@ -1,4 +1,5 @@
-# Copyright (C) 2003, 2005, 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 2006, 2008, 2009 Free Software Foundation,
+# Inc.
# 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
diff --git a/lib/Autom4te/FileUtils.pm b/lib/Autom4te/FileUtils.pm
index 63df0d4..c12498a 100644
--- a/lib/Autom4te/FileUtils.pm
+++ b/lib/Autom4te/FileUtils.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
# Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
diff --git a/lib/Autom4te/General.pm b/lib/Autom4te/General.pm
index ef9bc06..5443f28 100644
--- a/lib/Autom4te/General.pm
+++ b/lib/Autom4te/General.pm
@@ -1,5 +1,5 @@
# autoconf -- create `configure' using m4 macros
-# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007 Free Software
+# Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007, 2009 Free Software
# Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
diff --git a/lib/Autom4te/Request.pm b/lib/Autom4te/Request.pm
index 5c17c75..c18e55d 100644
--- a/lib/Autom4te/Request.pm
+++ b/lib/Autom4te/Request.pm
@@ -1,5 +1,5 @@
# autoconf -- create `configure' using m4 macros
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc.
# 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
diff --git a/lib/Autom4te/Struct.pm b/lib/Autom4te/Struct.pm
index ca61749..9b511fd 100644
--- a/lib/Autom4te/Struct.pm
+++ b/lib/Autom4te/Struct.pm
@@ -1,5 +1,6 @@
# autoconf -- create `configure' using m4 macros
-# Copyright (C) 2001, 2002, 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2006, 2008, 2009 Free Software Foundation,
+# Inc.
# 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
diff --git a/lib/autoconf/Makefile.am b/lib/autoconf/Makefile.am
index fc33bab..698050c 100644
--- a/lib/autoconf/Makefile.am
+++ b/lib/autoconf/Makefile.am
@@ -1,6 +1,6 @@
# Make Autoconf library.
-# Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2006, 2009 Free Software Foundation, Inc.
# 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
diff --git a/lib/autoconf/autoconf.m4 b/lib/autoconf/autoconf.m4
index 0a838a6..b8bc6aa 100644
--- a/lib/autoconf/autoconf.m4
+++ b/lib/autoconf/autoconf.m4
@@ -1,8 +1,8 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Driver that loads the Autoconf macro files.
#
-# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2006, 2008 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2006, 2008, 2009 Free
+# Software Foundation, Inc.
#
# 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
diff --git a/lib/autoconf/autoscan.m4 b/lib/autoconf/autoscan.m4
index ca91e82..7e2a434 100644
--- a/lib/autoconf/autoscan.m4
+++ b/lib/autoconf/autoscan.m4
@@ -1,7 +1,7 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Interface with autoscan.
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2009 Free Software Foundation, Inc.
# 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
diff --git a/lib/autoconf/autoupdate.m4 b/lib/autoconf/autoupdate.m4
index ceb26ed..df44cee 100644
--- a/lib/autoconf/autoupdate.m4
+++ b/lib/autoconf/autoupdate.m4
@@ -2,7 +2,7 @@
# Interface with autoupdate.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2003, 2004, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2006, 2009 Free Software Foundation, Inc.
# 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
diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index e8ec0ad..9fdd1b2 100644
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -1,7 +1,7 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Checking for functions.
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+# 2009 Free Software Foundation, Inc.
#
# 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
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index f030c26..ecc7db2 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1,9 +1,10 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Parameterized macros.
-m4_define([_AC_COPYRIGHT_YEARS],
-[Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+m4_define([_AC_COPYRIGHT_YEARS], [
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-Foundation, Inc.])
+Foundation, Inc.
+])
# 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
diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4
index 8f7729b..e03bf35 100644
--- a/lib/autoconf/libs.m4
+++ b/lib/autoconf/libs.m4
@@ -1,7 +1,8 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Checking for libraries.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2008, 2009 Free Software Foundation,
+# Inc.
# 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
diff --git a/lib/autoconf/oldnames.m4 b/lib/autoconf/oldnames.m4
index f5e61a4..b8c2ed2 100644
--- a/lib/autoconf/oldnames.m4
+++ b/lib/autoconf/oldnames.m4
@@ -1,6 +1,7 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Support old macros, and provide automated updates.
-# Copyright (C) 1994, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1999, 2000, 2001, 2003, 2009 Free Software
+# Foundation, Inc.
#
# 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
diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4
index 949f9ad..2738125 100644
--- a/lib/autoconf/types.m4
+++ b/lib/autoconf/types.m4
@@ -1,8 +1,8 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Type related macros: existence, sizeof, and structure members.
#
-# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008 Free
-# Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009
+# Free Software Foundation, Inc.
#
# 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
diff --git a/lib/autoscan/Makefile.am b/lib/autoscan/Makefile.am
index ee676c6..3517a8d 100644
--- a/lib/autoscan/Makefile.am
+++ b/lib/autoscan/Makefile.am
@@ -1,6 +1,6 @@
# Make Autoscan library.
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2009 Free Software Foundation, Inc.
# 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
diff --git a/lib/autoscan/autoscan.pre b/lib/autoscan/autoscan.pre
index d1e4e1c..c5c3780 100644
--- a/lib/autoscan/autoscan.pre
+++ b/lib/autoscan/autoscan.pre
@@ -1,5 +1,5 @@
# autoscan's mapping to Autoconf macros -*- Makefile -*-
-# Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002
+# Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2009
# Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
diff --git a/lib/autotest/Makefile.am b/lib/autotest/Makefile.am
index 006b7ef..6fd297a 100644
--- a/lib/autotest/Makefile.am
+++ b/lib/autotest/Makefile.am
@@ -1,6 +1,6 @@
# Make Autotest library.
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2009 Free Software Foundation, Inc.
# 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
diff --git a/lib/autotest/autotest.m4 b/lib/autotest/autotest.m4
index 8e2002d..8c7ff02 100644
--- a/lib/autotest/autotest.m4
+++ b/lib/autotest/autotest.m4
@@ -1,6 +1,6 @@
# This file is part of Autoconf. -*- Autoconf -*-
# M4 macros used in building test suites.
-# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2009 Free Software Foundation, Inc.
# 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
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index cf88b99..d73932c 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1,8 +1,9 @@
# This file is part of Autoconf. -*- Autoconf -*-
# M4 macros used in building test suites.
-m4_define([_AT_COPYRIGHT_YEARS],
-[Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-2009 Free Software Foundation, Inc.])
+m4_define([_AT_COPYRIGHT_YEARS], [
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+2009 Free Software Foundation, Inc.
+])
# 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
diff --git a/lib/emacs/autoconf-mode.el b/lib/emacs/autoconf-mode.el
index 7b507f6..ec1b3cc 100644
--- a/lib/emacs/autoconf-mode.el
+++ b/lib/emacs/autoconf-mode.el
@@ -6,7 +6,7 @@
;; This file is part of Autoconf
-;; Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2006, 2009 Free Software Foundation, Inc.
;;
;; 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
diff --git a/lib/emacs/autotest-mode.el b/lib/emacs/autotest-mode.el
index 006d99c..da481f2 100644
--- a/lib/emacs/autotest-mode.el
+++ b/lib/emacs/autotest-mode.el
@@ -5,7 +5,7 @@
;; This file is part of Autoconf
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2009 Free Software Foundation, Inc.
;;
;; 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
diff --git a/lib/freeze.mk b/lib/freeze.mk
index 37b87a3..2237101 100644
--- a/lib/freeze.mk
+++ b/lib/freeze.mk
@@ -1,6 +1,7 @@
# Freeze M4 files.
-# Copyright (C) 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009 Free Software
+# Foundation, Inc.
# 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
diff --git a/lib/m4sugar/foreach.m4 b/lib/m4sugar/foreach.m4
index d9ebfe0..c645a7d 100644
--- a/lib/m4sugar/foreach.m4
+++ b/lib/m4sugar/foreach.m4
@@ -4,7 +4,7 @@
# Speeds up GNU M4 1.4.x by avoiding quadratic $@ recursion, but penalizes
# GNU M4 1.6 by requiring more memory and macro expansions.
#
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
#
# 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
diff --git a/maint.mk b/maint.mk
index 1b35a3b..6394508 100644
--- a/maint.mk
+++ b/maint.mk
@@ -21,6 +21,9 @@
# ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
ME := maint.mk
+# Override this in cfg.mk if you use a non-standard build-aux directory.
+build_aux ?= $(srcdir)/build-aux
+
# Do not save the original name or timestamp in the .tar.gz file.
# Use --rsyncable if available.
gzip_rsyncable := \
@@ -31,7 +34,7 @@ GIT = git
VC = $(GIT)
VC-tag = git tag -s -m '$(VERSION)'
-VC_LIST = $(srcdir)/build-aux/vc-list-files -C $(srcdir)
+VC_LIST = $(build_aux)/vc-list-files -C $(srcdir)
VC_LIST_EXCEPT = \
$(VC_LIST) | if test -f $(srcdir)/.x-$@; then \
@@ -552,7 +555,7 @@ move_if_change ?= move-if-change
emit_upload_commands:
@echo =====================================
@echo =====================================
- @echo "$(srcdir)/build-aux/gnupload $(GNUPLOADFLAGS) \\"
+ @echo "$(build_aux)/gnupload $(GNUPLOADFLAGS) \\"
@echo " --to $(gnu_rel_host):$(PACKAGE) \\"
@echo " $(rel-files)"
@echo '# send the /tmp/announcement e-mail'
@@ -575,3 +578,27 @@ alpha beta major: news-date-check changelog-check
$(local-check)
$(VC) commit -m \
'$(prev_version_file): Record previous version: $(VERSION).' \
$(prev_version_file)
+
+
+.PHONY: web-manual
+web-manual:
+ @test -z "$(manual_title)" \
+ && { echo define manual_title in cfg.mk 1>&2; exit 1; } || :
+ @cd '$(srcdir)/doc'; \
+ $(SHELL) ../build-aux/gendocs.sh -o '$(abs_builddir)/doc/manual' \
+ --email $(PACKAGE_BUGREPORT) $(PACKAGE) \
+ "$(PACKAGE_NAME) - $(manual_title)"
+ @echo " *** Upload the doc/manual directory to web-cvs."
+
+# If you have an additional project-specific rule,
+# define it in cfg.mk and set this variable to its name.
+update-copyright-local ?=
+
+# Run this rule once per year (usually early in January)
+# to update all FSF copyright year lists in your project.
+update-copyright-exclude-regexp ?= (^|/)COPYING$$
+.PHONY: update-copyright
+update-copyright: $(update-copyright-local)
+ grep -l -w Copyright $$($(VC_LIST_EXCEPT)) \
+ | grep -v -E '$(update-copyright-exclude-regexp)' \
+ | xargs $(build_aux)/$@
diff --git a/man/Makefile.am b/man/Makefile.am
index 119c91d..2df4428 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,6 +1,7 @@
# Make Autoconf man pages.
-# Copyright (C) 2001, 2004-2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# Foundation, Inc.
# 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
diff --git a/tests/atlocal.in b/tests/atlocal.in
index adce2bf..42a6590 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -2,7 +2,8 @@
# @configure_input@
# Configurable variable values for Autoconf test suite.
-# Copyright (C) 2000, 2001, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2005, 2008, 2009 Free Software Foundation,
+# Inc.
#
# 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
diff --git a/tests/autoscan.at b/tests/autoscan.at
index 0c214fe..d7a35dc 100644
--- a/tests/autoscan.at
+++ b/tests/autoscan.at
@@ -2,7 +2,7 @@
AT_BANNER([Autoscan.])
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2009 Free Software Foundation, Inc.
#
# 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
diff --git a/tests/foreign.at b/tests/foreign.at
index 43ada94..30e9aab 100644
--- a/tests/foreign.at
+++ b/tests/foreign.at
@@ -2,8 +2,8 @@
AT_BANNER([Compatibility with other tools.])
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free
-# Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
+# Free Software Foundation, Inc.
#
# 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
diff --git a/tests/fortran.at b/tests/fortran.at
index e8faf94..8bed4e6 100644
--- a/tests/fortran.at
+++ b/tests/fortran.at
@@ -2,7 +2,8 @@
AT_BANNER([Fortran low level compiling/preprocessing macros.])
-# Copyright (C) 2000, 2001, 2003, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003, 2008, 2009 Free Software Foundation,
+# Inc.
#
# 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
diff --git a/tests/mktests.sh b/tests/mktests.sh
index 0b9da0f..8ea39ff 100755
--- a/tests/mktests.sh
+++ b/tests/mktests.sh
@@ -2,8 +2,8 @@
# Build some of the Autoconf test files.
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+# 2009 Free Software Foundation, Inc.
# 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
diff --git a/tests/semantics.at b/tests/semantics.at
index d25b188..ce0e0e6 100644
--- a/tests/semantics.at
+++ b/tests/semantics.at
@@ -2,8 +2,8 @@
AT_BANNER([Semantics.])
-# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007 Free Software
-# Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2009 Free
+# Software Foundation, Inc.
#
# 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
diff --git a/tests/suite.at b/tests/suite.at
index 7302b60..6b3617a 100644
--- a/tests/suite.at
+++ b/tests/suite.at
@@ -1,6 +1,7 @@
# Validation suite for Autoconf -*- Autotest -*-
-# Copyright (C) 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2009 Free Software
+# Foundation, Inc.
#
# 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
diff --git a/tests/wrapper.as b/tests/wrapper.as
index 8d85f51..b335de7 100644
--- a/tests/wrapper.as
+++ b/tests/wrapper.as
@@ -1,7 +1,7 @@
AS_INIT[]dnl -*- shell-script -*-
# wrapper.as -- running address@hidden@' as if it were installed.
# @configure_input@
-# Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2007, 2009 Free Software Foundation, Inc.
# 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
hooks/post-receive
--
GNU Autoconf source repository
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Autoconf source repository branch, master, updated. v2.64-13-g1c69422,
Eric Blake <=