[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-1
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-118-gd3b9280 |
|
Date: |
Sat, 28 Apr 2012 09:17:14 +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 Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=d3b9280103cd5cc8a63d98a194bfe60074bbff23
The branch, ng/master has been updated
via d3b9280103cd5cc8a63d98a194bfe60074bbff23 (commit)
via ad5c2a2891320be4071a92ed8a5cf7bfd0ef08a5 (commit)
via 83249bd36c0cd76d80addc8bc0ab5db565635316 (commit)
via d3500f61b9bae2c5729f2383d9ab62248d42800a (commit)
via 5f810d0d3ae5ea8937566a4f6e62b1dd024253b8 (commit)
via 8ea72c74515c921196abcc99dbbcd9db8bd1c060 (commit)
via 05f91a92c801d25b218c675d20f0bf61c471337b (commit)
via af627d3702b71802035daf992d11e37f48df2b21 (commit)
via bc1038325d663ab99a6f01e4db172b02743d8319 (commit)
via 56badcd480c91e73e3a7f56beed80e0ebe566eab (commit)
via d2ca16855177719a0fa4fe65fe2a9ec8d7a06aec (commit)
via b99b5be0d88d69698f71a5cc85d841c9816f3031 (commit)
via 8ce1b6c9863659835c7a5bcd13d2c1b6b55a1e69 (commit)
via 018a186636ba4078496f56a945d25087bca127a3 (commit)
via ab14841acb906346345c9298ef50621d298f4a28 (commit)
via ae3d5dfc50f05470b791ec7f67ca8b401915c3ee (commit)
via e25a41fac07478d88ad87e96bd254843882ec229 (commit)
via f31fe4f003b0eb12eb082ae4dca837f36eaac214 (commit)
via eb7e8f33f4c020814436e9983481c1d63c278256 (commit)
via 63e07a9c1297679818e8c584413a2b1df88c834a (commit)
via 444618b3264dbc1efec2b02f2f3ab6d5e6fb77fe (commit)
via ba5b98ffd2bd6abdb260cf4842ad9902e2ee1132 (commit)
via 5368def8bb1635d7275a2ac3e08b8127933afe05 (commit)
via ec799b7b8baf649b8031d9b5cbdecf78a057c3a3 (commit)
via d3eaa6aa4e6f83d0fc5cf69f765ab72ddcf0ff94 (commit)
via 119d65e9e06ffc6e8997d3ba386429db6cc2ef27 (commit)
via a18d188cc8e8c0a3f84494a2f1f2df26630f038e (commit)
via 80526828985bc37e8c682b83c779919fdde78d31 (commit)
via f357bed82aed91aa3eef5e157df4814c7fc26028 (commit)
via 1837e206e69dadeffbf3b1364c468235f19d5815 (commit)
from 9500eebfbe5b5fc58e59e78b537b6a713decc9d0 (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 d3b9280103cd5cc8a63d98a194bfe60074bbff23
Author: Stefano Lattarini <address@hidden>
Date: Sat Apr 28 11:13:11 2012 +0200
[ng] maintcheck: fix a check out-of-sync with the source tree layout
* syntax-checks.mk (sc_grep_for_bad_make_include): Use 't/*.log',
not 'tests/*.log', to get the list of the testsuite logs.
Signed-off-by: Stefano Lattarini <address@hidden>
commit ad5c2a2891320be4071a92ed8a5cf7bfd0ef08a5
Merge: 9500eeb 83249bd
Author: Stefano Lattarini <address@hidden>
Date: Sat Apr 28 11:07:34 2012 +0200
Merge branch 'master' into ng/master
* master:
fixup: avoid unconditional re-bootstrapping on "make dist"
build: ensure release year in copyright notice is up-to-date
cosmetics: fix spacing in THANKS
readme: explicitly state we use ranges in copyright years
aclocal: remove the --acdir option
bootstrap: add convenience make target
m4: delete several obsolete macros
automake, aclocal: update copyright year in output
maint: don't use "union" merge driver for NEWS anymore
build: avoid too greedy rebuilds in the testsuite
tests: avoid yet another spurious environment influence
tests: fix a failure in Lex/C++ tests on Mac OS X
tests: fix a spurious failure due to truncated timestamps
build: require autoconf 2.69
build: don't require minimal automake version in AM_INIT_AUTOMAKE
post-release: major version bump
post-release: minor version bump
release: stable major release 1.12
tests: cater to systems installing libs in /lib64
tests: fix spurious failure on Mac OS X
-----------------------------------------------------------------------
Summary of changes:
.gitattributes | 1 -
GNUmakefile | 54 +++-
HACKING | 6 +-
Makefile.am | 18 +-
NEWS | 49 ++--
README | 3 +
THANKS | 787 ++++++++++++++++++++++---------------------
aclocal.in | 17 +-
automake.in | 7 +-
bootstrap => bootstrap.sh | 3 +
configure.ac | 22 +-
doc/automake.texi | 67 +----
lib/Automake/Config.in | 5 +-
m4/amversion.m4 | 6 +-
m4/ccstdc.m4 | 25 --
m4/dmalloc.m4 | 4 +-
m4/header.m4 | 11 -
m4/lispdir.m4 | 4 +-
m4/maintainer.m4 | 4 +-
m4/obsol-gt.m4 | 12 -
m4/obsol-lt.m4 | 12 -
m4/obsolete.m4 | 37 --
syntax-checks.mk | 2 +-
t/aclocal-acdir.sh | 26 +--
t/aclocal-print-acdir.sh | 3 -
t/autohdr2.sh | 30 --
t/confh.sh | 2 +-
t/confh4.sh | 2 +-
t/confh6.sh | 2 +-
t/confh7.sh | 2 +-
t/confh8.sh | 2 +-
t/confsub.sh | 2 +-
t/lex-clean-cxx.sh | 2 +-
t/lex-depend-cxx.sh | 6 +-
t/lex-libobj.sh | 9 +-
t/obsolete.sh | 57 ---
t/posixsubst-libraries.sh | 8 +-
t/posixsubst-ltlibraries.sh | 8 +-
t/posixsubst-scripts.sh | 22 +-
t/remake11.sh | 1 +
t/self-check-is_newest.tap | 14 +-
t/stamph2.sh | 7 +-
t/subdir6.sh | 2 +-
t/transform3.sh | 41 ++-
44 files changed, 598 insertions(+), 806 deletions(-)
rename bootstrap => bootstrap.sh (95%)
delete mode 100644 m4/ccstdc.m4
delete mode 100644 m4/header.m4
delete mode 100644 m4/obsol-gt.m4
delete mode 100644 m4/obsol-lt.m4
delete mode 100644 m4/obsolete.m4
delete mode 100755 t/autohdr2.sh
delete mode 100755 t/obsolete.sh
diff --git a/.gitattributes b/.gitattributes
index 5126add..0d86adb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1 @@
-NEWS merge=union
*.texi* diff=texinfo
diff --git a/GNUmakefile b/GNUmakefile
index 2363ea8..a6ba2f9 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -15,14 +15,54 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# If the user runs GNU make but has not yet run ./configure,
-# give them an helpful diagnostic instead of a cryptic error.
-am--Makefile := $(wildcard Makefile)
-ifeq ($(am--Makefile),)
- $(warning There seems to be no Makefile in this directory.)
- $(warning You must run ./configure before running 'make'.)
- $(error Fatal Error)
+ifeq ($(wildcard Makefile),)
+ ifeq ($(filter bootstrap,$(MAKECMDGOALS)),bootstrap)
+ # Allow the user (or more likely the developer) to ask for a bootstrap
+ # of the package; of course, this can happen before configure is run,
+ # and in fact even before it is created.
+ else
+ # Else, If the user runs GNU make but has not yet run ./configure,
+ # give them an helpful diagnostic instead of a cryptic error.
+ $(warning There seems to be no Makefile in this directory.)
+ $(warning You must run ./configure before running 'make'.)
+ $(error Fatal Error)
+ endif
else
include ./Makefile
include $(srcdir)/syntax-checks.mk
endif
+
+# To allow bootstrapping also in an unconfigured tree.
+srcdir ?= .
+am__cd ?= CDPATH=. && unset CDPATH && cd
+AM_DEFAULT_VERBOSITY ?= 0
+V ?= $(AM_DEFAULT_VERBOSITY)
+
+ifeq ($(V),0)
+ AM_V_BOOTSTRAP = @echo " BOOTSTRAP";
+ AM_V_CONFIGURE = @echo " CONFIGURE";
+ AM_V_REMAKE = @echo " REMAKE";
+else
+ AM_V_BOOTSTRAP =
+ AM_V_CONFIGURE =
+ AM_V_REMAKE =
+endif
+
+# Must be phony, not to be confused with the 'bootstrap' script.
+.PHONY: bootstrap
+bootstrap:
+ $(AM_V_BOOTSTRAP)$(am__cd) $(srcdir) && ./bootstrap.sh
+ $(AM_V_CONFIGURE)set -e; \
+ am__bootstrap_configure () { \
+ $(srcdir)/configure $${1+"$$@"} $(BOOTSTRAP_CONFIGURE_FLAGS); \
+ }; \
+ if test -f $(srcdir)/config.status; then \
+ : config.status should return a string properly quoted for eval; \
+ old_configure_flags=`$(srcdir)/config.status --config`; \
+ else \
+ old_configure_flags=""; \
+ fi; \
+ eval am__bootstrap_configure "$$old_configure_flags"
+ # The "make check" below is to ensure all the testsuite-required
+ # files are rebuilt.
+ $(AM_V_REMAKE)$(MAKE) clean && $(MAKE) check TESTS=t/get-sysconf
diff --git a/HACKING b/HACKING
index 70e6f96..e3153cc 100644
--- a/HACKING
+++ b/HACKING
@@ -96,7 +96,7 @@
= Working with git
* To regenerate dependent files created by aclocal and automake,
- use the 'bootstrap' script. It uses the code from the source
+ use the 'bootstrap.sh' script. It uses the code from the source
tree, so the resulting files (aclocal.m4 and Makefile.in) should
be the same as you would get if you install this version of
automake and use it to generate those files. Be sure to have the
@@ -231,7 +231,7 @@
distinguish net and repo versions.)
* Run this:
- ./bootstrap && ./configure && make && make check && make distcheck
+ ./bootstrap.sh && ./configure && make && make check && make distcheck
* Run "make git-tag-release".
This will run the maintainer checks, check that the NEWS file is
@@ -248,7 +248,7 @@
use "make GNUPLOADFLAGS='--user KEY' git-upload-release".
* Update version number in configure.ac to next alpha number.
- Re-run ./bootstrap and commit.
+ Re-run ./bootstrap.sh and commit.
* Don't forget to "git push" your changes so they appear in the public
git tree.
diff --git a/Makefile.am b/Makefile.am
index fafe586..bc8d557 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,7 +67,7 @@ TAGS_FILES = $(AUTOMAKESOURCES)
EXTRA_DIST += \
$(AUTOMAKESOURCES) \
- bootstrap \
+ bootstrap.sh \
GNUmakefile \
syntax-checks.mk \
HACKING \
@@ -274,13 +274,11 @@ dist_automake_ac_DATA = \
m4/ar-lib.m4 \
m4/as.m4 \
m4/auxdir.m4 \
- m4/ccstdc.m4 \
m4/cond.m4 \
m4/cond-if.m4 \
m4/depend.m4 \
m4/dmalloc.m4 \
m4/gcj.m4 \
- m4/header.m4 \
m4/init.m4 \
m4/install-sh.m4 \
m4/lead-dot.m4 \
@@ -290,9 +288,6 @@ dist_automake_ac_DATA = \
m4/minuso.m4 \
m4/missing.m4 \
m4/mkdirp.m4 \
- m4/obsol-gt.m4 \
- m4/obsol-lt.m4 \
- m4/obsolete.m4 \
m4/options.m4 \
m4/protos.m4 \
m4/python.m4 \
@@ -423,6 +418,9 @@ AM_TESTS_ENVIRONMENT += stderr_fileno_=9; export
stderr_fileno_;
# Automatically-computed dependencies for tests.
include $(srcdir)/testsuite-autodeps.am
+## The dependecies declared here are not truly complete, but such
+## completeness would cause more issues than it would solve. See
+## automake bug#11347.
$(srcdir)/autodeps.am: $(srcdir)/gen-testsuite-part
$(AM_V_at)rm -f testsuite-autodeps.tmp $@
$(AM_V_GEN)$(PERL) $(srcdir)/gen-testsuite-part
@@ -776,7 +774,7 @@ autodiffs:
&& $(am__cd) tmp \
&& $(GIT) checkout -q "$$rev" \
&& echo "$@: bootstrapping $$rev" \
- && $(SHELL) ./bootstrap \
+ && $(SHELL) ./bootstrap.sh \
&& echo "$@: copying files from $$rev" \
&& makefile_ins=`find . -name Makefile.in` \
&& (tar cf - configure aclocal.m4 $$makefile_ins) | \
@@ -894,7 +892,11 @@ update_copyright_env = \
.PHONY: update-copyright
update-copyright:
- $(AM_V_GEN)excluded_re=`echo $(FETCHFILES) \
+ $(AM_V_GEN)set -e; \
+ current_year=`date +%Y` && test -n "$$current_year" \
+ || { echo "$@: cannot get current year" >&1; exit 1; }; \
+ sed -i "/^RELEASE_YEAR=/s/=.*$$/=$$current_year/" configure.ac; \
+ excluded_re=`echo $(FETCHFILES) \
| sed -e 's|^|lib/|' -e 's| | lib/|g' -e 's, ,|,g'`; \
$(GIT) ls-files \
| grep -Ev '^(lib/)?(COPYING|INSTALL)$$' \
diff --git a/NEWS b/NEWS
index 75ca31f..8653603 100644
--- a/NEWS
+++ b/NEWS
@@ -1,21 +1,12 @@
-New in 1.11e:
+New in 1.13:
-* WARNING: Future backward-incompatibilities!
-
- - Starting from the next major Automake version (1.13), the rules to
- build pdf, ps and dvi output from Texinfo input will use the '--tidy'
- option by default. Since such an option was introduced in Texinfo
- 4.9, this means that Makefiles generated by future Automake versions
- will require at least that version of Texinfo.
+* Obsolete features removed:
- - Starting from the next major Automake version (1.13), the parallel
- testsuite harness (previously only enabled by the 'parallel-tests'
- option) will become the default one; the older serial testsuite
- harness will still be available through the use of the 'serial-tests'
- option.
+ - The deprecated aclocal option '--acdir' has been removed. You
+ should use the options '--automake-acdir' and '--system-acdir'
+ instead (which have been introduced in Automake 1.11.2).
- - The following long-obsolete m4 macros will be removed in the
- next major Automake version (1.13):
+ - The following long-obsolete m4 macros have been removed:
AM_PROG_CC_STDC: superseded by AC_PROG_CC since October 2002
fp_PROG_CC_STDC: broken alias for AM_PROG_CC_STDC
@@ -29,8 +20,25 @@ New in 1.11e:
of the now-removed automatic de-ANSI-fication
support of Automake)
- - All the "old alias" macros in 'm4/obsolete.m4' will be removed in
- the next major Automake version (1.13).
+ - All the "old alias" macros in 'm4/obsolete.m4' have been removed.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+New in 1.12:
+
+* WARNING: Future backward-incompatibilities!
+
+ - Starting from the next major Automake version (1.13), the rules to
+ build pdf, ps and dvi output from Texinfo input will use the '--tidy'
+ option by default. Since such an option was introduced in Texinfo
+ 4.9, this means that Makefiles generated by future Automake versions
+ will require at least that version of Texinfo.
+
+ - Starting from the next major Automake version (1.13), the parallel
+ testsuite harness (previously only enabled by the 'parallel-tests'
+ option) will become the default one; the older serial testsuite
+ harness will still be available through the use of the 'serial-tests'
+ option.
- Support for the "Cygnus-style" trees (enabled by the 'cygnus' option)
will be deprecated in the next minor version of Automake (1.12.1) and
@@ -45,11 +53,6 @@ New in 1.11e:
all be deprecated in the next minor version of Automake (1.12.1)
and removed in the next major version (1.13).
- - The '--acdir' option of aclocal is deprecated, and will probably
- be removed in the next major Automake release (1.13). You should
- use the options '--automake-acdir' and '--system-acdir' instead
- (which have been introduced in Automake 1.11.2).
-
- The exact order in which the directories in the aclocal macro
search path are looked up is probably going to be changed in the
next Automake release (1.13).
@@ -224,7 +227,7 @@ New in 1.11e:
'-Wall'. In previous versions, one has to use '-Wextra-portability'
to enable them.
-Bugs fixed in 1.11e:
+Bugs fixed in 1.12:
- Various minor bugfixes for recent or long-standing bugs.
diff --git a/README b/README
index 4b78fe9..b4a0b5b 100644
--- a/README
+++ b/README
@@ -128,6 +128,9 @@ New releases are announced to address@hidden If you want to
be informed, subscribe to that list by following the instructions at
<http://lists.gnu.org/mailman/listinfo/autotools-announce>.
+For any copyright year range specified as YYYY-ZZZZ in this package,
+that the range specifies every single year in that closed interval.
+
-----
Copyright (C) 1994-2012 Free Software Foundation, Inc.
diff --git a/THANKS b/THANKS
index 16367e1..1a38571 100644
--- a/THANKS
+++ b/THANKS
@@ -2,399 +2,400 @@ Automake was originally written by David J. MacKenzie
<address@hidden>.
It would not be what it is today without the invaluable help of these
people:
-Adam J. Richter address@hidden
-Adam Sampson address@hidden
-Adrian Bunk address@hidden
-Akim Demaille address@hidden
-Alan Modra address@hidden
-Alex Hornby address@hidden
-Alex Unleashed address@hidden
-Alexander Mai address@hidden
-Alexander Martens address@hidden
-Alexander V. Lukyanov address@hidden
-Alexander Turbov address@hidden
-Alexandre Duret-Lutz address@hidden
-Alexey Mahotkin address@hidden
-Alfred M. Szmidt address@hidden
-Andreas Bergmeier address@hidden
-Andreas Buening address@hidden
-Andreas Köhler address@hidden
-Andreas Schwab address@hidden
-Andrew Cagney address@hidden
-Andrew Suffield address@hidden
-Andris Pavenis address@hidden
-Andy Wingo address@hidden
-Angus Leeming address@hidden
-Anthony Green address@hidden
-Antonio Diaz Diaz address@hidden
-Arkadiusz Miskiewicz address@hidden
-Art Haas address@hidden
-Arto C. Nirkko address@hidden
-Assar Westerlund address@hidden
-Axel Belinfante address@hidden
-Bas Wijnen address@hidden
-Ben Pfaff address@hidden
-Benoit Sigoure address@hidden
-Bernard Giroud address@hidden
-Bernard Urban address@hidden
-Bernd Jendrissek address@hidden
-Bert Wesarg address@hidden
-Bill Currie address@hidden
-Bill Davidson address@hidden
-Bill Fenner address@hidden
-Bob Friesenhahn address@hidden
-Bob Proulx address@hidden
-Bob Rossi address@hidden
-Bobby Jack address@hidden
-Braden N. McDaniel address@hidden
-Brendan O'Dea address@hidden
-Brian Cameron address@hidden
-Brian Ford address@hidden
-Brian Gough address@hidden
-Brian Jones address@hidden
-Bruce Korb address@hidden
-Bruno Haible address@hidden
-Carsten Lohrke address@hidden
-Charles Wilson address@hidden
-Chris Hoogendyk address@hidden
-Chris Pickett address@hidden
-Chris Provenzano address@hidden
-Christian Cornelssen address@hidden
-Christina Gratorp address@hidden
-Claudio Fontana address@hidden
-Clifford Wolf address@hidden
-Dagobert Michelsen address@hidden
-Daiki Ueno address@hidden
-Dalibor Topic address@hidden
-danbp address@hidden
-Daniel Jacobowitz address@hidden
-Daniel Kahn Gillmor address@hidden
-Daniel Richard G. address@hidden
-Debarshi Ray address@hidden
-Dave Brolley address@hidden
-Dave Goodell address@hidden
-Dave Hart address@hidden
-Dave Korn address@hidden
-Dave Morrison address@hidden
-David A. Swierczek address@hidden
-David A. Wheeler address@hidden
-David Byron address@hidden
-David Fang address@hidden
-Davyd Madeley address@hidden
-David Pashley address@hidden
-David Zaroski address@hidden
-Dean Povey address@hidden
-Dennis J. Linse address@hidden
-Dennis Schridde address@hidden
-Derek R. Price address@hidden
-Diab Jerius address@hidden
-Didier Cassirame address@hidden
-Dieter Baron address@hidden
-Dieter Jurzitza address@hidden
-ÐилÑн ÐалаÑзов address@hidden
-Dmitry Mikhin address@hidden
-Dmitry V. Levin address@hidden
-Doug Evans address@hidden
-Duncan Gibson address@hidden
-Ed Hartnett address@hidden
-Eleftherios Gkioulekas address@hidden
-Elena A. Vengerova address@hidden
-Elmar Hoffmann address@hidden
-Elrond address@hidden
-Enrico Scholz address@hidden
-Erez Zadok address@hidden
-Eric Blake address@hidden
-Eric Dorland address@hidden
-Eric Magnien address@hidden
-Eric Siegerman address@hidden
-Eric Sunshine address@hidden
-Erick Branderhorst address@hidden
-Erik Lindahl address@hidden
-Esben Haabendal Soerensen address@hidden
-Ezra Peisach address@hidden
-Fabian Alenius address@hidden
-Federico Simoncelli address@hidden
-Flavien Astraud address@hidden
-Florian Briegel address@hidden
-Francesco Salvestrini address@hidden
-François Pinard address@hidden
-Fred Fish address@hidden
-Ganesan Rajagopal address@hidden
-Garrett D'Amore address@hidden
-Garth Corral address@hidden
-Gary V Vaughan address@hidden
-Geoffrey Keating address@hidden
-Glenn Amerine address@hidden
-Gord Matzigkeit address@hidden
-Gordon Sadler address@hidden
-Graham Reitz address@hidden
-Greg A. Woods address@hidden
-Greg Schafer address@hidden
-Guido Draheim address@hidden
-Guillermo Ontañón address@hidden
-Gustavo Carneiro address@hidden
-Gwenole Beauchesne address@hidden
-H.J. Lu address@hidden
-H.Merijn Brand address@hidden
-Hans Ulrich Niedermann address@hidden
-Harald Dunkel address@hidden
-Harlan Stenn address@hidden
-He Li address@hidden
-Henrik Frystyk Nielsen address@hidden
-Ian Lance Taylor address@hidden
-Ignacy Gawedzki address@hidden
-ÐлÑÑ Ð. ÐолÑбев address@hidden
-Imacat address@hidden
-Inoue address@hidden
-Jack Kelly address@hidden
-James Amundson address@hidden
-James Henstridge address@hidden
-James R. Van Zandt address@hidden
-James Youngman address@hidden
-Jan Engelhardt address@hidden
-Janos Farkas address@hidden
-Jared Davis address@hidden
-Jason DeVinney address@hidden
-Jason Duell address@hidden
-Jason Molenda address@hidden
-Javier Jardón address@hidden
-Jeff Bailey address@hidden
-Jeff A. Daily address@hidden
-Jeff Garzik address@hidden
-Jeff Squyres address@hidden
-Jens Elkner address@hidden
-Jens Krüger address@hidden
-Jens Petersen address@hidden
-Jeremy Nimmer address@hidden
-Jerome Lovy address@hidden
-Jerome Santini address@hidden
-Jesse Chisholm address@hidden
-Jim Meyering address@hidden
-Joakim Tjernlund address@hidden
-Jochen Kuepper address@hidden
-Joel N. Weber II address@hidden
-Joerg-Martin Schwarz address@hidden
-Johan Dahlin address@hidden
-Johan Danielsson address@hidden
-Johannes Nicolai address@hidden
-John Calcote address@hidden
-John F Trudeau address@hidden
-John Pierce address@hidden
-John Ratliff address@hidden
-John R. Cary address@hidden
-John W. Coomes address@hidden
-Jonathan Nieder address@hidden
-Joseph S. Myers address@hidden
-Josh MacDonald address@hidden
-Joshua Cowan address@hidden
-js pendry address@hidden
-Juergen A. Erhard address@hidden
-Juergen Keil address@hidden
-Juergen Leising address@hidden
-Julien Sopena address@hidden
-Jürg Billeter address@hidden
-Karl Berry address@hidden
-Karl Heuer address@hidden
-Kelley Cook address@hidden
-Kent Boortz address@hidden
-Kevin Dalley address@hidden
-Kevin P. Fleming. address@hidden
-Kevin Ryde address@hidden
-Kevin Street address@hidden
-Klaus Reichl address@hidden
-Krzysztof Żelechowski address@hidden
-L. Peter Deutsch address@hidden
-Ladislav Strojil address@hidden
-Larry Daniel address@hidden
-Larry Jones address@hidden
-Lars Hecking address@hidden
-Lars J. Aas address@hidden
-Laurent Morichetti address@hidden
-Leo Davis address@hidden
-Leonardo Boiko address@hidden
-Loulou Pouchet address@hidden
-Ludovic Courtès address@hidden
-Luo Yi address@hidden
-Maciej Stachowiak address@hidden
-Maciej W. Rozycki address@hidden
-Manu Rouat address@hidden
-Marcus Brinkmann address@hidden
-Marcus G. Daniels address@hidden
-Marius Vollmer address@hidden
-Marc-Antoine Perennou address@hidden
-Mark D. Baushke address@hidden
-Mark Eichin address@hidden
-Mark Elbrecht address@hidden
-Mark Galassi address@hidden
-Mark Mitchell address@hidden
-Mark Phillips address@hidden
-Markku Rossi address@hidden
-Markus Duft address@hidden
-Markus F.X.J. Oberhumer address@hidden
-Martin Bravenboer address@hidden
-Martin Frydl address@hidden
-Martin Waitz address@hidden
-Mathias Doreille address@hidden
-Mathias Froehlich address@hidden
-Mathias Hasselmann address@hidden
-Matt Leach address@hidden
-Matthew D. Langston address@hidden
-Matthias Andree address@hidden
-Matthias Clasen address@hidden
-Matthias Klose address@hidden
-Maxim Sinev address@hidden
-Maynard Johnson address@hidden
-Merijn de Jonge address@hidden
-Michael Brantley address@hidden
-Michael Hofmann address@hidden
-Michael Ploujnikov address@hidden
-Michel de Ruiter address@hidden
-Mike Castle address@hidden
-Mike Frysinger address@hidden
-Mike Nolta address@hidden
-Miles Bader address@hidden
-Miloslav Trmac address@hidden
-Miodrag Vallat address@hidden
-Mirko Streckenbach address@hidden
-Miroslaw Dobrzanski-Neumann address@hidden
-Morten Eriksen address@hidden
-Motoyuki Kasahara address@hidden
-Nathanael Nerode address@hidden
-Nelson H. F. Beebe address@hidden
-Nicholas Wourms address@hidden
-Nick Bowler address@hidden
-Nicolas Joly address@hidden
-Nicolas Thiery address@hidden
-NightStrike address@hidden
-Nik A. Melchior address@hidden
-NISHIDA Keisuke address@hidden
-Noah Friedman address@hidden
-Norman Gray address@hidden
-Nyul Laszlo address@hidden
-OKUJI Yoshinori address@hidden
-Olivier Fourdan address@hidden
-Olivier Louchart-Fletcher address@hidden
-Olly Betts address@hidden
-Oren Ben-Kiki address@hidden
-Owen Taylor address@hidden
-Panther Martin address@hidden
-Patrick Welche address@hidden
-Patrik Weiskircher address@hidden
-Paul Berrevoets address@hidden
-Paul D. Smith address@hidden
-Paul Eggert address@hidden
-Paul Jarc address@hidden
-Paul Lunau address@hidden
-Paul Martinolich address@hidden
-Paul Thomas address@hidden
-Pavel Roskin address@hidden
-Pavel Sanda address@hidden
-Per Bothner address@hidden
-Per Cederqvist address@hidden
-Per Oyvind Hvidsten address@hidden
-Peter Breitenlohner address@hidden
-Peter Eisentraut address@hidden
-Peter Gavin address@hidden
-Peter Johansson address@hidden
-Peter Mattis address@hidden
-Peter Muir address@hidden
-Peter O'Gorman address@hidden
-Peter Rosin address@hidden
-Peter Seiderer address@hidden
-Petter Reinholdtsen address@hidden
-Petteri Räty address@hidden
-Phil Edwards address@hidden
-Phil Nelson address@hidden
-Philip Fong address@hidden
-Philip S Tellis address@hidden
-ÐÑÑ
алÑÑкий ЮÑий ÐндÑÐµÐµÐ²Ð¸Ñ address@hidden
-Quentin Glidic address@hidden
-Rainer Orth address@hidden
-Rafael Laboissiere address@hidden
-Rainer Tammer address@hidden
-Raja R Harinath address@hidden
-Ralf Corsepius address@hidden
-Ralf Menzel address@hidden
-Ralf Wildenhues address@hidden
-Ralph Schleicher address@hidden
-Ramón GarcÃa Fernández address@hidden
-Reuben Thomas address@hidden
-Rich Wales address@hidden
-Richard Boulton address@hidden
-Richard Dawe address@hidden
-Rob Savoye address@hidden
-Robert Bihlmeyer address@hidden
-Robert Boehne address@hidden
-Robert Collins address@hidden
-Robert Swafford address@hidden
-Roberto Bagnara address@hidden
-Roman Fietze address@hidden
-Ronald Landheer address@hidden
-Roumen Petrov address@hidden
-Russ Allbery address@hidden
-Rusty Ballinger address@hidden
-Ryan Lortie address@hidden
-Ryan T. Sammartino address@hidden
-Sam Hocevar address@hidden
-Sam Sirlin address@hidden
-Sam Steingold address@hidden
-Sander Niemeijer address@hidden
-Santiago Vila address@hidden
-Scott James Remnant address@hidden
-Sergey Poznyakoff address@hidden
-Sergey Vlasov address@hidden
-Seth Alves address@hidden
-Shannon L. Brown address@hidden
-Shuhei Amakawa address@hidden
-Shigio Yamaguchi address@hidden
-Simon Josefsson address@hidden
-Simon Richter address@hidden
-Stefan Nordhausen address@hidden
-Stefano Lattarini address@hidden
-Stepan Kasal address@hidden
-Steve M. Robbins address@hidden
-Steve Goetze address@hidden
-Steven Drake address@hidden
-Steven G. Johnson address@hidden
-Sven Verdoolaege address@hidden
-Tamara L. Dahlgren address@hidden
-Tatu Ylonen address@hidden
-Teun Burgers address@hidden
-The Crimson Binome address@hidden
-Theodoros V. Kalamatianos address@hidden
-Thien-Thi Nguyen address@hidden
-Thomas Fitzsimmons address@hidden
-Thomas Gagne address@hidden
-Thomas Klausner address@hidden
-Thomas Morgan address@hidden
-Thomas Schwinge address@hidden
-Thomas Tanner address@hidden
-Toralf Förster address@hidden
-Tim Goodwin address@hidden
-Tim Landscheidt address@hidden
-Tim Mooney address@hidden
-Tim Retout address@hidden
-Tim Rice address@hidden
-Tim Van Holder address@hidden
-Toshio Kuratomi address@hidden
-Tom Epperly address@hidden
-Ulrich Drepper address@hidden
-Ulrich Eckhardt address@hidden
-Václav Haisman address@hidden
-Vadim Zeitlin address@hidden
-Vincent Lefevre address@hidden
-Vladimir Serbinenko address@hidden
-Volker Boerchers address@hidden
-Werner John address@hidden
-Werner Koch address@hidden
-Werner Lemberg address@hidden
-William Pursell address@hidden
-William S Fulton address@hidden
-Yann Droneaud address@hidden
-Younes Younes address@hidden
-Zack Weinberg address@hidden
-Zbigniew JÄdrzejewski-Szmek address@hidden
-Zoltan Rado address@hidden
+Adam J. Richter address@hidden
+Adam Mercer address@hidden
+Adam Sampson address@hidden
+Adrian Bunk address@hidden
+Akim Demaille address@hidden
+Alan Modra address@hidden
+Alex Hornby address@hidden
+Alex Unleashed address@hidden
+Alexander Mai address@hidden
+Alexander Martens address@hidden
+Alexander V. Lukyanov address@hidden
+Alexander Turbov address@hidden
+Alexandre Duret-Lutz address@hidden
+Alexey Mahotkin address@hidden
+Alfred M. Szmidt address@hidden
+Andreas Bergmeier address@hidden
+Andreas Buening address@hidden
+Andreas Köhler address@hidden
+Andreas Schwab address@hidden
+Andrew Cagney address@hidden
+Andrew Suffield address@hidden
+Andris Pavenis address@hidden
+Andy Wingo address@hidden
+Angus Leeming address@hidden
+Anthony Green address@hidden
+Antonio Diaz Diaz address@hidden
+Arkadiusz Miskiewicz address@hidden
+Art Haas address@hidden
+Arto C. Nirkko address@hidden
+Assar Westerlund address@hidden
+Axel Belinfante address@hidden
+Bas Wijnen address@hidden
+Ben Pfaff address@hidden
+Benoit Sigoure address@hidden
+Bernard Giroud address@hidden
+Bernard Urban address@hidden
+Bernd Jendrissek address@hidden
+Bert Wesarg address@hidden
+Bill Currie address@hidden
+Bill Davidson address@hidden
+Bill Fenner address@hidden
+Bob Friesenhahn address@hidden
+Bob Proulx address@hidden
+Bob Rossi address@hidden
+Bobby Jack address@hidden
+Braden N. McDaniel address@hidden
+Brendan O'Dea address@hidden
+Brian Cameron address@hidden
+Brian Ford address@hidden
+Brian Gough address@hidden
+Brian Jones address@hidden
+Bruce Korb address@hidden
+Bruno Haible address@hidden
+Carsten Lohrke address@hidden
+Charles Wilson address@hidden
+Chris Hoogendyk address@hidden
+Chris Pickett address@hidden
+Chris Provenzano address@hidden
+Christian Cornelssen address@hidden
+Christina Gratorp address@hidden
+Claudio Fontana address@hidden
+Clifford Wolf address@hidden
+Dagobert Michelsen address@hidden
+Daiki Ueno address@hidden
+Dalibor Topic address@hidden
+danbp address@hidden
+Daniel Jacobowitz address@hidden
+Daniel Kahn Gillmor address@hidden
+Daniel Richard G. address@hidden
+Debarshi Ray address@hidden
+Dave Brolley address@hidden
+Dave Goodell address@hidden
+Dave Hart address@hidden
+Dave Korn address@hidden
+Dave Morrison address@hidden
+David A. Swierczek address@hidden
+David A. Wheeler address@hidden
+David Byron address@hidden
+David Fang address@hidden
+Davyd Madeley address@hidden
+David Pashley address@hidden
+David Zaroski address@hidden
+Dean Povey address@hidden
+Dennis J. Linse address@hidden
+Dennis Schridde address@hidden
+Derek R. Price address@hidden
+Diab Jerius address@hidden
+Didier Cassirame address@hidden
+Dieter Baron address@hidden
+Dieter Jurzitza address@hidden
+ÐилÑн ÐалаÑзов address@hidden
+Dmitry Mikhin address@hidden
+Dmitry V. Levin address@hidden
+Doug Evans address@hidden
+Duncan Gibson address@hidden
+Ed Hartnett address@hidden
+Eleftherios Gkioulekas address@hidden
+Elena A. Vengerova address@hidden
+Elmar Hoffmann address@hidden
+Elrond address@hidden
+Enrico Scholz address@hidden
+Erez Zadok address@hidden
+Eric Blake address@hidden
+Eric Dorland address@hidden
+Eric Magnien address@hidden
+Eric Siegerman address@hidden
+Eric Sunshine address@hidden
+Erick Branderhorst address@hidden
+Erik Lindahl address@hidden
+Esben Haabendal Soerensen address@hidden
+Ezra Peisach address@hidden
+Fabian Alenius address@hidden
+Federico Simoncelli address@hidden
+Flavien Astraud address@hidden
+Florian Briegel address@hidden
+Francesco Salvestrini address@hidden
+François Pinard address@hidden
+Fred Fish address@hidden
+Ganesan Rajagopal address@hidden
+Garrett D'Amore address@hidden
+Garth Corral address@hidden
+Gary V Vaughan address@hidden
+Geoffrey Keating address@hidden
+Glenn Amerine address@hidden
+Gord Matzigkeit address@hidden
+Gordon Sadler address@hidden
+Graham Reitz address@hidden
+Greg A. Woods address@hidden
+Greg Schafer address@hidden
+Guido Draheim address@hidden
+Guillermo Ontañón address@hidden
+Gustavo Carneiro address@hidden
+Gwenole Beauchesne address@hidden
+H.J. Lu address@hidden
+H.Merijn Brand address@hidden
+Hans Ulrich Niedermann address@hidden
+Harald Dunkel address@hidden
+Harlan Stenn address@hidden
+He Li address@hidden
+Henrik Frystyk Nielsen address@hidden
+Ian Lance Taylor address@hidden
+Ignacy Gawedzki address@hidden
+ÐлÑÑ Ð. ÐолÑбев address@hidden
+Imacat address@hidden
+Inoue address@hidden
+Jack Kelly address@hidden
+James Amundson address@hidden
+James Henstridge address@hidden
+James R. Van Zandt address@hidden
+James Youngman address@hidden
+Jan Engelhardt address@hidden
+Janos Farkas address@hidden
+Jared Davis address@hidden
+Jason DeVinney address@hidden
+Jason Duell address@hidden
+Jason Molenda address@hidden
+Javier Jardón address@hidden
+Jeff Bailey address@hidden
+Jeff A. Daily address@hidden
+Jeff Garzik address@hidden
+Jeff Squyres address@hidden
+Jens Elkner address@hidden
+Jens Krüger address@hidden
+Jens Petersen address@hidden
+Jeremy Nimmer address@hidden
+Jerome Lovy address@hidden
+Jerome Santini address@hidden
+Jesse Chisholm address@hidden
+Jim Meyering address@hidden
+Joakim Tjernlund address@hidden
+Jochen Kuepper address@hidden
+Joel N. Weber II address@hidden
+Joerg-Martin Schwarz address@hidden
+Johan Dahlin address@hidden
+Johan Danielsson address@hidden
+Johannes Nicolai address@hidden
+John Calcote address@hidden
+John F Trudeau address@hidden
+John Pierce address@hidden
+John Ratliff address@hidden
+John R. Cary address@hidden
+John W. Coomes address@hidden
+Jonathan Nieder address@hidden
+Joseph S. Myers address@hidden
+Josh MacDonald address@hidden
+Joshua Cowan address@hidden
+js pendry address@hidden
+Juergen A. Erhard address@hidden
+Juergen Keil address@hidden
+Juergen Leising address@hidden
+Julien Sopena address@hidden
+Jürg Billeter address@hidden
+Karl Berry address@hidden
+Karl Heuer address@hidden
+Kelley Cook address@hidden
+Kent Boortz address@hidden
+Kevin Dalley address@hidden
+Kevin P. Fleming. address@hidden
+Kevin Ryde address@hidden
+Kevin Street address@hidden
+Klaus Reichl address@hidden
+Krzysztof Żelechowski address@hidden
+L. Peter Deutsch address@hidden
+Ladislav Strojil address@hidden
+Larry Daniel address@hidden
+Larry Jones address@hidden
+Lars Hecking address@hidden
+Lars J. Aas address@hidden
+Laurent Morichetti address@hidden
+Leo Davis address@hidden
+Leonardo Boiko address@hidden
+Loulou Pouchet address@hidden
+Ludovic Courtès address@hidden
+Luo Yi address@hidden
+Maciej Stachowiak address@hidden
+Maciej W. Rozycki address@hidden
+Manu Rouat address@hidden
+Marcus Brinkmann address@hidden
+Marcus G. Daniels address@hidden
+Marius Vollmer address@hidden
+Marc-Antoine Perennou address@hidden
+Mark D. Baushke address@hidden
+Mark Eichin address@hidden
+Mark Elbrecht address@hidden
+Mark Galassi address@hidden
+Mark Mitchell address@hidden
+Mark Phillips address@hidden
+Markku Rossi address@hidden
+Markus Duft address@hidden
+Markus F.X.J. Oberhumer address@hidden
+Martin Bravenboer address@hidden
+Martin Frydl address@hidden
+Martin Waitz address@hidden
+Mathias Doreille address@hidden
+Mathias Froehlich address@hidden
+Mathias Hasselmann address@hidden
+Matt Leach address@hidden
+Matthew D. Langston address@hidden
+Matthias Andree address@hidden
+Matthias Clasen address@hidden
+Matthias Klose address@hidden
+Maxim Sinev address@hidden
+Maynard Johnson address@hidden
+Merijn de Jonge address@hidden
+Michael Brantley address@hidden
+Michael Hofmann address@hidden
+Michael Ploujnikov address@hidden
+Michel de Ruiter address@hidden
+Mike Castle address@hidden
+Mike Frysinger address@hidden
+Mike Nolta address@hidden
+Miles Bader address@hidden
+Miloslav Trmac address@hidden
+Miodrag Vallat address@hidden
+Mirko Streckenbach address@hidden
+Miroslaw Dobrzanski-Neumann address@hidden
+Morten Eriksen address@hidden
+Motoyuki Kasahara address@hidden
+Nathanael Nerode address@hidden
+Nelson H. F. Beebe address@hidden
+Nicholas Wourms address@hidden
+Nick Bowler address@hidden
+Nicolas Joly address@hidden
+Nicolas Thiery address@hidden
+NightStrike address@hidden
+Nik A. Melchior address@hidden
+NISHIDA Keisuke address@hidden
+Noah Friedman address@hidden
+Norman Gray address@hidden
+Nyul Laszlo address@hidden
+OKUJI Yoshinori address@hidden
+Olivier Fourdan address@hidden
+Olivier Louchart-Fletcher address@hidden
+Olly Betts address@hidden
+Oren Ben-Kiki address@hidden
+Owen Taylor address@hidden
+Panther Martin address@hidden
+Patrick Welche address@hidden
+Patrik Weiskircher address@hidden
+Paul Berrevoets address@hidden
+Paul D. Smith address@hidden
+Paul Eggert address@hidden
+Paul Jarc address@hidden
+Paul Lunau address@hidden
+Paul Martinolich address@hidden
+Paul Thomas address@hidden
+Pavel Roskin address@hidden
+Pavel Sanda address@hidden
+Per Bothner address@hidden
+Per Cederqvist address@hidden
+Per Oyvind Hvidsten address@hidden
+Peter Breitenlohner address@hidden
+Peter Eisentraut address@hidden
+Peter Gavin address@hidden
+Peter Johansson address@hidden
+Peter Mattis address@hidden
+Peter Muir address@hidden
+Peter O'Gorman address@hidden
+Peter Rosin address@hidden
+Peter Seiderer address@hidden
+Petter Reinholdtsen address@hidden
+Petteri Räty address@hidden
+Phil Edwards address@hidden
+Phil Nelson address@hidden
+Philip Fong address@hidden
+Philip S Tellis address@hidden
+ÐÑÑ
алÑÑкий ЮÑий ÐндÑÐµÐµÐ²Ð¸Ñ address@hidden
+Quentin Glidic address@hidden
+Rainer Orth address@hidden
+Rafael Laboissiere address@hidden
+Rainer Tammer address@hidden
+Raja R Harinath address@hidden
+Ralf Corsepius address@hidden
+Ralf Menzel address@hidden
+Ralf Wildenhues address@hidden
+Ralph Schleicher address@hidden
+Ramón GarcÃa Fernández address@hidden
+Reuben Thomas address@hidden
+Rich Wales address@hidden
+Richard Boulton address@hidden
+Richard Dawe address@hidden
+Rob Savoye address@hidden
+Robert Bihlmeyer address@hidden
+Robert Boehne address@hidden
+Robert Collins address@hidden
+Robert Swafford address@hidden
+Roberto Bagnara address@hidden
+Roman Fietze address@hidden
+Ronald Landheer address@hidden
+Roumen Petrov address@hidden
+Russ Allbery address@hidden
+Rusty Ballinger address@hidden
+Ryan Lortie address@hidden
+Ryan T. Sammartino address@hidden
+Sam Hocevar address@hidden
+Sam Sirlin address@hidden
+Sam Steingold address@hidden
+Sander Niemeijer address@hidden
+Santiago Vila address@hidden
+Scott James Remnant address@hidden
+Sergey Poznyakoff address@hidden
+Sergey Vlasov address@hidden
+Seth Alves address@hidden
+Shannon L. Brown address@hidden
+Shuhei Amakawa address@hidden
+Shigio Yamaguchi address@hidden
+Simon Josefsson address@hidden
+Simon Richter address@hidden
+Stefan Nordhausen address@hidden
+Stefano Lattarini address@hidden
+Stepan Kasal address@hidden
+Steve M. Robbins address@hidden
+Steve Goetze address@hidden
+Steven Drake address@hidden
+Steven G. Johnson address@hidden
+Sven Verdoolaege address@hidden
+Tamara L. Dahlgren address@hidden
+Tatu Ylonen address@hidden
+Teun Burgers address@hidden
+The Crimson Binome address@hidden
+Theodoros V. Kalamatianos address@hidden
+Thien-Thi Nguyen address@hidden
+Thomas Fitzsimmons address@hidden
+Thomas Gagne address@hidden
+Thomas Klausner address@hidden
+Thomas Morgan address@hidden
+Thomas Schwinge address@hidden
+Thomas Tanner address@hidden
+Toralf Förster address@hidden
+Tim Goodwin address@hidden
+Tim Landscheidt address@hidden
+Tim Mooney address@hidden
+Tim Retout address@hidden
+Tim Rice address@hidden
+Tim Van Holder address@hidden
+Toshio Kuratomi address@hidden
+Tom Epperly address@hidden
+Ulrich Drepper address@hidden
+Ulrich Eckhardt address@hidden
+Václav Haisman address@hidden
+Vadim Zeitlin address@hidden
+Vincent Lefevre address@hidden
+Vladimir Serbinenko address@hidden
+Volker Boerchers address@hidden
+Werner John address@hidden
+Werner Koch address@hidden
+Werner Lemberg address@hidden
+William Pursell address@hidden
+William S Fulton address@hidden
+Yann Droneaud address@hidden
+Younes Younes address@hidden
+Zack Weinberg address@hidden
+Zbigniew JÄdrzejewski-Szmek address@hidden
+Zoltan Rado address@hidden
;; Local Variables:
;; mode: text
diff --git a/aclocal.in b/aclocal.in
index 85528af..a5c0ea5 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -840,9 +840,8 @@ $output";
# name in the header.
$output = "# generated automatically by aclocal $VERSION -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996-$RELEASE_YEAR Free Software Foundation, Inc.
+
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -936,7 +935,7 @@ sub version()
{
print <<EOF;
aclocal (GNU $PACKAGE) $VERSION
-Copyright (C) 2011 Free Software Foundation, Inc.
+Copyright (C) $RELEASE_YEAR Free Software Foundation, Inc.
License GPLv2+: GNU GPL version 2 or later
<http://gnu.org/licenses/gpl-2.0.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
@@ -947,15 +946,6 @@ EOF
exit 0;
}
-# Using --acdir overrides both the automake (versioned) directory and
-# the public (unversioned) system directory. This usage is obsolete.
-sub handle_acdir_option ($$)
-{
- msg 'obsolete', '', "'--acdir' is deprecated\n";
- @system_includes = ($_[1]);
- @automake_includes = ();
-}
-
# Parse command line.
sub parse_arguments ()
{
@@ -966,7 +956,6 @@ sub parse_arguments ()
(
'help' => sub { usage(0); },
'version' => \&version,
- 'acdir=s' => \&handle_acdir_option,
'system-acdir=s' => sub { shift; @system_includes = @_; },
'automake-acdir=s' => sub { shift; @automake_includes = @_; },
'diff:s' => \$diff_command,
diff --git a/automake.in b/automake.in
index bb019d4..0a6b069 100644
--- a/automake.in
+++ b/automake.in
@@ -252,9 +252,8 @@ my %standard_prefix =
# Copyright on generated Makefile.ins.
my $gen_copyright = "\
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-$RELEASE_YEAR Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -8159,7 +8158,7 @@ sub version ()
{
print <<EOF;
automake (GNU $PACKAGE) $VERSION
-Copyright (C) 2011 Free Software Foundation, Inc.
+Copyright (C) $RELEASE_YEAR Free Software Foundation, Inc.
License GPLv2+: GNU GPL version 2 or later
<http://gnu.org/licenses/gpl-2.0.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
diff --git a/bootstrap b/bootstrap.sh
similarity index 95%
rename from bootstrap
rename to bootstrap.sh
index 93262f0..2673b66 100755
--- a/bootstrap
+++ b/bootstrap.sh
@@ -77,6 +77,8 @@ dosubst ()
{
rm -f $2
in=`echo $1 | sed 's,^.*/,,'`
+ current_year=`date +%Y` && test -n "$current_year" \
+ || { echo "$me: cannot get current year" >&2; exit 1; }
sed -e "address@hidden@%$APIVERSION%g" \
-e "address@hidden@%$PACKAGE%g" \
-e "address@hidden@%$PERL%g" \
@@ -84,6 +86,7 @@ dosubst ()
-e "address@hidden@%$BOOTSTRAP_SHELL%g" \
-e "address@hidden@%$VERSION%g" \
-e "address@hidden@%$datadir%g" \
+ -e "address@hidden@%$current_year%g" \
-e "address@hidden@%Generated from $in; do not edit by hand.%g" \
$1 > $2
chmod a-w $2
diff --git a/configure.ac b/configure.ac
index 0a48a7f..25208bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,8 +15,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-AC_PREREQ([2.68])
-AC_INIT([GNU Automake-NG], [1.11e], address@hidden)
+AC_PREREQ([2.69])
+AC_INIT([GNU Automake-NG], [1.12a], address@hidden)
AC_CONFIG_SRCDIR([automake.in])
AC_CONFIG_AUX_DIR([lib])
@@ -40,7 +40,12 @@ dnl We call AC_PROG_CC in an unusual way, and only for use
in our
dnl testsuite, so also use 'no-dependencies' and 'no-define' among
dnl the automake options to avoid bloating and potential problems.
AM_INIT_AUTOMAKE([dist-xz filename-length-max=99 color-tests
- parallel-tests no-define no-dependencies])
+ parallel-tests no-define no-dependencies])
+
+## Keep this on a line of its own, since it must be found and processed
+## by the 'update-copyright' rule in out Makefile.
+RELEASE_YEAR=2012
+AC_SUBST([RELEASE_YEAR])
# The API version is the base version. We must guarantee
# compatibility for all releases with the same API version.
@@ -60,8 +65,14 @@ AC_SUBST([system_acdir], ["\${datadir}/aclocal"])
# $AUTOMAKE and $ACLOCAL are always run after a "cd $top_srcdir",
# hence '.' is really what we want for perllibdir, libdir, and acdir.
-ACLOCAL="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal\"
--acdir=m4 -I m4"
-AUTOMAKE="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/automake\"
--libdir=lib"
+# Use '-I' with aclocal so that our own *.m4 files in m4/ gets included,
+# not copied, in aclocal.m4.
+ACLOCAL="\
+ perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal\" \
+ --automake-acdir=m4 --system-acdir=m4/acdir -I m4"
+AUTOMAKE="\
+ perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/automake\" \
+ --libdir=lib"
AC_PATH_PROG([PERL], [perl])
if test -z "$PERL"; then
@@ -299,7 +310,6 @@ _AM_COMPILER_CAN_FAIL([AC_PROG_FC(dnl
[xlf90 f90 pgf90 pghpf epcf90 g95 gfortran])],
[FC=false; _AM_SKIP_COMP_TESTS([Fortran])])
-# FIXME this won't work as expected until we can assume autoconf 2.69 :-(
AS_IF([test x"$GFC" = x"yes"], [am_FC_is_GNU=yes], [am_FC_is_GNU=no])
_AM_COMPILER_CAN_FAIL([AC_PROG_F77(dnl
diff --git a/doc/automake.texi b/doc/automake.texi
index f15c3e5..8e56040 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -190,7 +190,6 @@ Auto-generating aclocal.m4
Autoconf macros supplied with Automake
* Public Macros:: Macros that you can use.
-* Obsolete Macros:: Macros that will soon be removed.
* Private Macros:: Macros that you should not use.
Directories
@@ -2986,8 +2985,8 @@ macro.
@item AC_CONFIG_HEADERS
Automake will generate rules to rebuild these headers. Older versions
-of Automake required the use of @code{AM_CONFIG_HEADER}
-(@pxref{Macros}); this is no longer the case.
+of Automake required the use of @code{AM_CONFIG_HEADER}; this is no
+longer the case, and that macro has indeed been removed.
As with @code{AC_CONFIG_FILES} (@pxref{Requirements}), parts of the
specification using shell variables will be ignored as far as
@@ -3924,7 +3923,6 @@ Automake ships with several Autoconf macros that you can
use from your
@menu
* Public Macros:: Macros that you can use.
-* Obsolete Macros:: Macros that will soon be removed.
* Private Macros:: Macros that you should not use.
@end menu
@@ -4079,67 +4077,6 @@ define @code{WITH_DMALLOC} and add @option{-ldmalloc} to
@code{LIBS}.
@end table
address@hidden Obsolete Macros
address@hidden Obsolete Macros
address@hidden obsolete macros
address@hidden autoupdate
-
-Although using some of the following macros was required in past
-releases, you should not use any of them in new code. @emph{All
-these macros will be removed in the next major Automake version};
-if you are still using them, running @command{autoupdate} should
-adjust your @file{configure.ac} automatically (@pxref{autoupdate
-Invocation, , Using @command{autoupdate} to Modernize
address@hidden, autoconf, The Autoconf Manual}).
address@hidden it NOW!}
-
address@hidden @code
-
address@hidden AM_CONFIG_HEADER
address@hidden AM_CONFIG_HEADER
-Automake will generate rules to automatically regenerate the config
-header. This obsolete macro is a synonym of @code{AC_CONFIG_HEADERS}
-today (@pxref{Optional}).
-
address@hidden AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
address@hidden AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
-If the use of @code{TIOCGWINSZ} requires @file{<sys/ioctl.h>}, then
-define @code{GWINSZ_IN_SYS_IOCTL}. Otherwise @code{TIOCGWINSZ} can be
-found in @file{<termios.h>}. This macro is obsolete, you should
-use Autoconf's @code{AC_HEADER_TIOCGWINSZ} instead.
-
address@hidden AM_PROG_MKDIR_P
address@hidden AM_PROG_MKDIR_P
address@hidden @code{mkdir -p}, macro check
address@hidden MKDIR_P
address@hidden mkdir_p
-
-From Automake 1.8 to 1.9.6 this macro used to define the output
-variable @code{mkdir_p} to one of @code{mkdir -p}, @code{install-sh
--d}, or @code{mkinstalldirs}.
-
-Nowadays Autoconf provides a similar functionality with
address@hidden (@pxref{Particular Programs, , Particular
-Program Checks, autoconf, The Autoconf Manual}), however this defines
-the output variable @code{MKDIR_P} instead. In case you are still
-using the @code{AM_PROG_MKDIR_P} macro in your @file{configure.ac},
-or its provided variable @code{$(mkdir_p)} in your @file{Makefile.am},
-you are advised to switch ASAP to the more modern Autoconf-provided
-interface instead; both the macro and the variable @emph{will be
-removed} in the next major Automake release.
-
address@hidden AM_SYS_POSIX_TERMIOS
address@hidden AM_SYS_POSIX_TERMIOS
address@hidden POSIX termios headers
address@hidden termios POSIX headers
-Check to see if POSIX termios headers and functions are available on the
-system. If so, set the shell variable @code{am_cv_sys_posix_termios} to
address@hidden If not, set the variable to @samp{no}. This macro is obsolete,
-you should use Autoconf's @code{AC_SYS_POSIX_TERMIOS} instead.
-
address@hidden table
-
-
@node Private Macros
@subsection Private Macros
diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
index 24c979c..bbf55ac 100644
--- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in
@@ -22,8 +22,8 @@ use 5.006;
require Exporter;
our @ISA = qw (Exporter);
-our @EXPORT = qw ($APIVERSION $PACKAGE $PACKAGE_BUGREPORT $VERSION $libdir
- $perl_threads);
+our @EXPORT = qw ($APIVERSION $PACKAGE $PACKAGE_BUGREPORT $VERSION
+ $RELEASE_YEAR $libdir $perl_threads);
# Parameters set by configure. Not to be changed. NOTE: assign
# VERSION as string so that e.g. version 0.30 will print correctly.
@@ -31,6 +31,7 @@ our $APIVERSION = '@APIVERSION@';
our $PACKAGE = '@PACKAGE@';
our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
our $VERSION = '@VERSION@';
+our $RELEASE_YEAR = '@RELEASE_YEAR@';
our $libdir = '@datadir@/@address@hidden@APIVERSION@';
our $perl_threads = @PERL_THREADS@;
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 15c6dcb..74e7972 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -14,10 +14,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11e'
+[am__api_version='1.12a'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11e], [],
+m4_if([$1], [1.12a], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -33,7 +33,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11e])dnl
+[AM_AUTOMAKE_VERSION([1.12a])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/m4/ccstdc.m4 b/m4/ccstdc.m4
deleted file mode 100644
index d57f055..0000000
--- a/m4/ccstdc.m4
+++ /dev/null
@@ -1,25 +0,0 @@
-## ----------------------------------------- ## -*- Autoconf -*-
-## ANSIfy the C compiler whenever possible. ##
-## From Franc,ois Pinard ##
-## ----------------------------------------- ##
-
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# This was merged into AC_PROG_CC in Autoconf.
-
-AU_DEFUN([AM_PROG_CC_STDC],
-[AC_PROG_CC
-AC_DIAGNOSE([obsolete], [$0:
- your code should no longer depend upon 'am_cv_prog_cc_stdc', but upon
- 'ac_cv_prog_cc_stdc'. Remove this warning and the assignment when
- you adjust the code. You can also remove the above call to
- AC_PROG_CC if you already called it elsewhere.])
-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-])
-AU_DEFUN([fp_PROG_CC_STDC])
diff --git a/m4/dmalloc.m4 b/m4/dmalloc.m4
index be1a5b3..536ea91 100644
--- a/m4/dmalloc.m4
+++ b/m4/dmalloc.m4
@@ -9,7 +9,7 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 6
+# serial 7
AC_DEFUN([AM_WITH_DMALLOC],
[AC_MSG_CHECKING([if malloc debugging is wanted])
@@ -26,5 +26,3 @@ else
AC_MSG_RESULT([no])
fi], [AC_MSG_RESULT([no])])
])
-
-AU_DEFUN([fp_WITH_DMALLOC], [AM_WITH_DMALLOC])
diff --git a/m4/header.m4 b/m4/header.m4
deleted file mode 100644
index 2555b96..0000000
--- a/m4/header.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-## -*- Autoconf -*-
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index 2dd6a0f..c4840f4 100644
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -9,7 +9,7 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 11
+# serial 12
# AM_PATH_LISPDIR
# ---------------
@@ -51,5 +51,3 @@ AC_DEFUN([AM_PATH_LISPDIR],
])
AC_SUBST([lispdir])
])# AM_PATH_LISPDIR
-
-AU_DEFUN([ud_PATH_LISPDIR], [AM_PATH_LISPDIR])
diff --git a/m4/maintainer.m4 b/m4/maintainer.m4
index a8f39a3..ffc1ddf 100644
--- a/m4/maintainer.m4
+++ b/m4/maintainer.m4
@@ -7,7 +7,7 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 7
+# serial 8
# AM_MAINTAINER_MODE([DEFAULT-MODE])
# ----------------------------------
@@ -35,5 +35,3 @@ AC_MSG_CHECKING([whether to enable maintainer-specific
portions of Makefiles])
AC_SUBST([MAINT])dnl
]
)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
diff --git a/m4/obsol-gt.m4 b/m4/obsol-gt.m4
deleted file mode 100644
index bd2400d..0000000
--- a/m4/obsol-gt.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-# Support for obsolete Gettext macro. -*- Autoconf -*-
-
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# See comment in obsolete.m4.
-AU_DEFUN([ud_GNU_GETTEXT], [AM_GNU_GETTEXT])
diff --git a/m4/obsol-lt.m4 b/m4/obsol-lt.m4
deleted file mode 100644
index af8fb1b..0000000
--- a/m4/obsol-lt.m4
+++ /dev/null
@@ -1,12 +0,0 @@
-# Support for obsolete Libtool macro. -*- Autoconf -*-
-
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# See comment in obsolete.m4.
-AU_DEFUN([gm_PROG_LIBTOOL], [AM_PROG_LIBTOOL])
diff --git a/m4/obsolete.m4 b/m4/obsolete.m4
deleted file mode 100644
index 9a26cac..0000000
--- a/m4/obsolete.m4
+++ /dev/null
@@ -1,37 +0,0 @@
-## -*- Autoconf -*-
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Obsolete Automake macros.
-
-# We put here only the macros whose substitution is not an Automake
-# macro; otherwise including this file would trigger dependencies for
-# all the substitutions. Generally, obsolete Automake macros are
-# better AU_DEFUNed in the same file as their replacement, or alone in
-# a separate file (see obsol-gt.m4 or obsol-lt.m4 for instance).
-
-AU_DEFUN([AC_FEATURE_CTYPE], [AC_HEADER_STDC])
-AU_DEFUN([AC_FEATURE_ERRNO], [AC_REPLACE_FUNCS([strerror])])
-AU_DEFUN([AM_CYGWIN32], [AC_CYGWIN])
-AU_DEFUN([AM_EXEEXT], [AC_EXEEXT])
-AU_DEFUN([AM_FUNC_MKTIME], [AC_FUNC_MKTIME])
-AU_DEFUN([AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL],
- [AC_HEADER_TIOCGWINSZ])
-AU_DEFUN([AM_MINGW32], [AC_MINGW32])
-AU_DEFUN([AM_PROG_INSTALL], [AC_PROG_INSTALL])
-AU_DEFUN([AM_SANITY_CHECK_CC], [AC_PROG_CC])
-AU_DEFUN([AM_SYS_POSIX_TERMIOS], [AC_SYS_POSIX_TERMIOS])
-AU_DEFUN([fp_FUNC_FNMATCH], [AC_FUNC_FNMATCH])
-AU_DEFUN([fp_PROG_INSTALL], [AC_PROG_INSTALL])
-AU_DEFUN([md_TYPE_PTRDIFF_T], [AC_CHECK_TYPES([ptrdiff_t])])
-
-# Don't know how to translate these.
-# If used, Autoconf will complain that they are possibly unexpended;
-# this seems a good enough error message.
-# AC_FEATURE_EXIT
-# AC_SYSTEM_HEADER
diff --git a/syntax-checks.mk b/syntax-checks.mk
index d024867..1124bfc 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -330,7 +330,7 @@ sc_grep_for_bad_make_include = \
exit 1; \
fi
sc_tests_make_simple_include: sc_ensure_testsuite_has_run
- @files=tests/*.log; $(sc_grep_for_bad_make_include)
+ @files='t/*.log'; $(sc_grep_for_bad_make_include)
sc_make_simple_include:
@files=" \
$(xtests) \
diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh
index 88caef6..e5b2bd2 100755
--- a/t/aclocal-acdir.sh
+++ b/t/aclocal-acdir.sh
@@ -14,9 +14,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test aclocal's '--acdir', '--automake-acdir' and '--system-acdir'
-# options. Also check that stuff in the automake acdir takes precedence
-# over stuff in the system acdir.
+# Test aclocal's '--automake-acdir' and '--system-acdir' options. Also
+# check that stuff in the automake acdir takes precedence over stuff in
+# the system acdir.
. ./defs || Exit 1
@@ -72,24 +72,4 @@ $FGREP 'fake--init--automake' configure
$FGREP 'am--macro' configure
$FGREP 'my--macro' configure && Exit 1 # Just to be sure.
-rm -rf autom4te*.cache
-
-# Obsolescent '--acdir' option.
-$ACLOCAL -Wobsolete --acdir am 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep '.*--acdir.*deprecated' stderr
-
-rm -rf autom4te*.cache
-
-$ACLOCAL -Wno-obsolete --acdir am
-$AUTOCONF --force
-$FGREP 'fake--init--automake' configure
-$FGREP 'am--macro' configure
-
-rm -rf autom4te*.cache
-
-$ACLOCAL -Wno-obsolete --acdir sys 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'macro .*AM_INIT_AUTOMAKE.* not found' stderr
-
:
diff --git a/t/aclocal-print-acdir.sh b/t/aclocal-print-acdir.sh
index 3d8bf4e..53ad556 100755
--- a/t/aclocal-print-acdir.sh
+++ b/t/aclocal-print-acdir.sh
@@ -22,9 +22,6 @@ am_create_testdir=empty
$ACLOCAL --print-ac-dir
test "`$ACLOCAL --print-ac-dir`" = "$am_system_acdir"
-$ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir
-test "`$ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir`" = foo
-
$ACLOCAL --system-acdir /bar --print-ac-dir
test "`$ACLOCAL --system-acdir /bar --print-ac-dir`" = /bar
diff --git a/t/autohdr2.sh b/t/autohdr2.sh
deleted file mode 100755
index 6f5415e..0000000
--- a/t/autohdr2.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002-2012 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 2, 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/>.
-
-# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
-
-. ./defs || Exit 1
-
-cat >>configure.ac <<EOF
-AM_CONFIG_HEADER([thisfile.h])
-EOF
-
-: > Makefile.am
-
-$ACLOCAL
-$AUTOHEADER
-
-test -f thisfile.h.in
diff --git a/t/confh.sh b/t/confh.sh
index 4759619..9dc2f15 100755
--- a/t/confh.sh
+++ b/t/confh.sh
@@ -20,7 +20,7 @@
. ./defs || Exit 1
cat >> configure.ac << 'END'
-AM_CONFIG_HEADER([include/config.h])
+AC_CONFIG_HEADERS([include/config.h])
AC_OUTPUT
END
diff --git a/t/confh4.sh b/t/confh4.sh
index ea6a9ff..665e04a 100755
--- a/t/confh4.sh
+++ b/t/confh4.sh
@@ -26,7 +26,7 @@
cat >> configure.ac << 'END'
AC_CONFIG_FILES([include/Makefile])
-AM_CONFIG_HEADER([include/config.h])
+AC_CONFIG_HEADERS([include/config.h])
AC_PROG_CC
END
diff --git a/t/confh6.sh b/t/confh6.sh
index c5e7d7e..c94c7ba 100755
--- a/t/confh6.sh
+++ b/t/confh6.sh
@@ -21,7 +21,7 @@
. ./defs || Exit 1
cat >> configure.ac << 'END'
-AM_CONFIG_HEADER([subdir/config.h])
+AC_CONFIG_HEADERS([subdir/config.h])
AC_OUTPUT
END
diff --git a/t/confh7.sh b/t/confh7.sh
index 4080779..0bc2465 100755
--- a/t/confh7.sh
+++ b/t/confh7.sh
@@ -20,7 +20,7 @@
. ./defs || Exit 1
cat >> configure.ac << 'END'
-AM_CONFIG_HEADER([config.h two.h])
+AC_CONFIG_HEADERS([config.h two.h])
END
: > Makefile.am
diff --git a/t/confh8.sh b/t/confh8.sh
index c3a27d1..2feaae5 100755
--- a/t/confh8.sh
+++ b/t/confh8.sh
@@ -20,7 +20,7 @@
. ./defs || Exit 1
cat >> configure.ac << 'END'
-AM_CONFIG_HEADER([one.h two.h])
+AC_CONFIG_HEADERS([one.h two.h])
AC_OUTPUT
END
diff --git a/t/confsub.sh b/t/confsub.sh
index 1887046..e788275 100755
--- a/t/confsub.sh
+++ b/t/confsub.sh
@@ -22,7 +22,7 @@
cat > configure.ac << 'END'
AC_INIT
AM_INIT_AUTOMAKE(nonesuch, nonesuch)
-AM_CONFIG_HEADER(subdir/config.h:subdir/config.hin)
+AC_CONFIG_HEADERS(subdir/config.h:subdir/config.hin)
AC_OUTPUT(Makefile subdir/Makefile)
END
diff --git a/t/lex-clean-cxx.sh b/t/lex-clean-cxx.sh
index 1c57524..d1a745b 100755
--- a/t/lex-clean-cxx.sh
+++ b/t/lex-clean-cxx.sh
@@ -20,7 +20,7 @@
# "make maintainer-clean".
# See also sister test 'lex-clean.test'.
-required=lex
+required='c++ lex'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/lex-depend-cxx.sh b/t/lex-depend-cxx.sh
index 27895fc..183a7fb 100755
--- a/t/lex-depend-cxx.sh
+++ b/t/lex-depend-cxx.sh
@@ -17,7 +17,7 @@
# Test to make sure dependencies work with Lex/C++.
# Test synthesized from PR automake/6.
-required=lex
+required='c++ lex'
. ./defs || Exit 1
cat >> configure.ac << 'END'
@@ -61,7 +61,6 @@ int yywrap (void)
}
int main (int argc, char **argv)
{
- printf("Hello, World!\n");
return 0;
}
END
@@ -69,8 +68,7 @@ END
cp joe.ll moe.l++
cat > my-hdr.hxx <<'END'
-// This header contains deliberetly invalid C (but valid C++)
-#include <cstdio>
+// This header contains deliberately invalid C (but valid C++).
using namespace std;
END
diff --git a/t/lex-libobj.sh b/t/lex-libobj.sh
index 930bb92..3e583cc 100755
--- a/t/lex-libobj.sh
+++ b/t/lex-libobj.sh
@@ -67,8 +67,13 @@ grep LIBOBJS Makefile # For debugging.
$MAKE
$MAKE distclean
-# Force "no system lex library".
-./configure LEXLIB='-L /lib'
+# Force "no system lex library". Setting LEXLIB to a non-empty value
+# ensures that configure won't search for a "lex library", and simply
+# rely on the LEXLIB to provide it, if needed. So, by setting LEXLIB
+# to a blank but non-empty value we can fool configure into thinking
+# that no system-level library providing a 'yywrap' function is
+# available. See also discussion on automake bug#11306.
+./configure LEXLIB=' '
grep LIBOBJS Makefile # For debugging.
grep '^LIBOBJS *=.*yywrap.*\.o' Makefile # Sanity check.
$MAKE
diff --git a/t/obsolete.sh b/t/obsolete.sh
deleted file mode 100755
index c4240c2..0000000
--- a/t/obsolete.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996-2012 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 2, 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/>.
-
-# Test to make sure obsolete macros can be autoupdated.
-
-# We need the following indirection in case someone exported e.g.
-# AUTOUPDATE='autoupdate --verbose'.
-set x ${AUTOUPDATE-autoupdate}
-required=$2
-. ./defs || Exit 1
-
-cat > configure.ac << 'END'
-AC_INIT
-END
-
-$PERL -ne '/AU_DEFUN\(\[(\w+)\]/ && print "$1\n"' \
- "$am_automake_acdir/obsolete.m4" > obs
-cat obs >> configure.ac
-$PERL -ne 'chomp; print "grep $_ output || Exit 1\n"; ' obs > obs.1
-$PERL -ne 'chomp; print "grep $_ configure.ac && Exit 1\n"; ' obs > obs.2
-echo : >> obs.1 # Since it will be sourced, it must end with a success.
-echo : >> obs.2 # Likewise.
-
-cat configure.ac # For debugging.
-cat obs.1 # Likewise.
-cat obs.2 # Likewise.
-
-# Sanity check. Make sure we have added something to configure.ac.
-test `wc -l <configure.ac` -gt 1
-
-$ACLOCAL
-
-# Expect Autoconf to complain about each of the macros in obs.
-$AUTOCONF -Wobsolete >output 2>&1 || { cat output; Exit 1; }
-cat output
-. ./obs.1
-# Make sure Autoupdate remove each of these macros.
-$AUTOUPDATE
-. ./obs.2
-
-# Autoconf should be able to grok the updated configure.ac.
-$AUTOCONF
-
-:
diff --git a/t/posixsubst-libraries.sh b/t/posixsubst-libraries.sh
index 5f32d4f..8d54820 100755
--- a/t/posixsubst-libraries.sh
+++ b/t/posixsubst-libraries.sh
@@ -40,10 +40,10 @@ libbar.c:
echo 'int bar(void) { return 0; }' > $@
installcheck-local:
- ls -l $(prefix)/lib
- test -f $(prefix)/lib/libfoo1.a
- test -f $(prefix)/lib/libfoo2.a
- test -f $(prefix)/lib/libbar.a
+ ls -l $(libdir)
+ test -f $(libdir)/libfoo1.a
+ test -f $(libdir)/libfoo2.a
+ test -f $(libdir)/libbar.a
END
echo 'int bar1(void) { return 0; }' > libfoo1.c
diff --git a/t/posixsubst-ltlibraries.sh b/t/posixsubst-ltlibraries.sh
index e3a128f..e235984 100755
--- a/t/posixsubst-ltlibraries.sh
+++ b/t/posixsubst-ltlibraries.sh
@@ -40,10 +40,10 @@ libbar.c:
echo 'int bar(void) { return 0; }' > $@
installcheck-local:
- ls -l $(prefix)/lib
- test -f $(prefix)/lib/libfoo1.la
- test -f $(prefix)/lib/libfoo2.la
- test -f $(prefix)/lib/libbar.la
+ ls -l $(libdir)
+ test -f $(libdir)/libfoo1.la
+ test -f $(libdir)/libfoo2.la
+ test -f $(libdir)/libbar.la
END
echo 'int bar1(void) { return 0; }' > libfoo1.c
diff --git a/t/posixsubst-scripts.sh b/t/posixsubst-scripts.sh
index 934b82e..cda515f 100755
--- a/t/posixsubst-scripts.sh
+++ b/t/posixsubst-scripts.sh
@@ -65,17 +65,17 @@ test2: distdir
test ! -r $(distdir)/quux.pl
installcheck-local:
- ls -l $(prefix)/libexec $(prefix)/bin $(prefix)/sbin
- test -f $(prefix)/sbin/foo1.sh
- test -x $(prefix)/sbin/foo1.sh
- test -f $(prefix)/sbin/foo2.sh
- test -x $(prefix)/sbin/foo2.sh
- test -f $(prefix)/libexec/bar1
- test -x $(prefix)/libexec/bar1
- test -f $(prefix)/libexec/bar2
- test -x $(prefix)/libexec/bar2
- test -f $(prefix)/bin/quux.pl
- test -x $(prefix)/bin/quux.pl
+ ls -l $(libexecdir) $(bindir) $(sbindir)
+ test -f $(sbindir)/foo1.sh
+ test -x $(sbindir)/foo1.sh
+ test -f $(sbindir)/foo2.sh
+ test -x $(sbindir)/foo2.sh
+ test -f $(libexecdir)/bar1
+ test -x $(libexecdir)/bar1
+ test -f $(libexecdir)/bar2
+ test -x $(libexecdir)/bar2
+ test -f $(bindir)/quux.pl
+ test -x $(bindir)/quux.pl
END
cat > foo1.sh <<'END'
diff --git a/t/remake11.sh b/t/remake11.sh
index ec96a08..b88254f 100755
--- a/t/remake11.sh
+++ b/t/remake11.sh
@@ -30,6 +30,7 @@ echo "AC_SUBST([FOO], [$magic1])" >> configure.ac
echo "@FOO@" > bar.in
echo "AC_CONFIG_FILES([bar])" >> configure.ac
+d=; unset d # Avoid unduly interferences from the environment.
for i in 0 1 2 3 4 5 6 7 8 9; do
d=${d+"$d/"}sub$i
echo "SUBDIRS = sub$i" > Makefile.am
diff --git a/t/self-check-is_newest.tap b/t/self-check-is_newest.tap
index 76b69ac..842c411 100755
--- a/t/self-check-is_newest.tap
+++ b/t/self-check-is_newest.tap
@@ -24,6 +24,16 @@ plan_ 21
Y () { command_ok_ "is_newest $*" is_newest "$@"; }
N () { command_ok_ "not is_newest $*" not is_newest "$@"; }
+# A simple "touch -r" might not work, since on some file systems, and/or
+# with some 'touch' versions, it might truncate the timestamp (or even
+# rounded it upwards maybe). So the first (apparently redundant) 'touch'
+# invocation below ensures that the timestamp gets "normalized" in a way
+# that allows it to be correctly copied by the second 'touch' invocation.
+copy_timestamp ()
+{
+ touch -r "$1" "$1" && touch -r "$1" "$2"
+}
+
: > a
$sleep
: > b
@@ -38,7 +48,7 @@ Y c b
Y c c
Y c a b c
-touch -r c d
+copy_timestamp c d
stat c d || : # For debugging.
@@ -69,7 +79,7 @@ done
Y x/foo x
N x x/foo
-touch -r x u
+copy_timestamp x u
Y x u
Y u x
diff --git a/t/stamph2.sh b/t/stamph2.sh
index 59a373a..5346bfc 100755
--- a/t/stamph2.sh
+++ b/t/stamph2.sh
@@ -18,10 +18,9 @@
. ./defs || Exit 1
cat >> configure.ac << END
-AM_CONFIG_HEADER([1.h
- 2.h:config.hin
- 3.h:sdir1/config1.hin])
-# AM_CONFIG_HEADER and AC_CONFIG_HEADERS should be synonyms.
+AC_CONFIG_HEADERS([1.h
+ 2.h:config.hin
+ 3.h:sdir1/config1.hin])
AC_CONFIG_HEADERS([sdir1/4.h
sdir1/5.h:config.hin
sdir1/6.h:sdir1/config1.hin
diff --git a/t/subdir6.sh b/t/subdir6.sh
index 5c17b65..26f3957 100755
--- a/t/subdir6.sh
+++ b/t/subdir6.sh
@@ -19,7 +19,7 @@
. ./defs || Exit 1
cat >> configure.ac << 'END'
-AM_CONFIG_HEADER([sub/config.h:sub/config.hin])
+AC_CONFIG_HEADERS([sub/config.h:sub/config.hin])
AC_OUTPUT
END
diff --git a/t/transform3.sh b/t/transform3.sh
index aaa69cb..6f1b811 100755
--- a/t/transform3.sh
+++ b/t/transform3.sh
@@ -35,6 +35,27 @@ bin_SCRIPTS = foo
pkgdata_DATA = bar.txt
pkglib_LIBRARIES = libzap.a
pkglibexec_SCRIPTS = mu
+
+test-install: install
+ find $(prefix) ;: For debugging.
+ test -f $(bindir)/gnu-foo
+ test -x $(bindir)/gnu-foo
+ test -f $(datadir)/foo/bar.txt
+ test ! -d $(datadir)/gnu-foo
+ test -f $(libdir)/foo/libzap.a
+ test ! -d $(libdir)/gnu-foo
+ test -f $(libexecdir)/foo/gnu-mu
+ test -x $(libexecdir)/foo/gnu-mu
+ test ! -d $(libexecdir)/gnu-foo
+
+test-installdirs: installdirs
+ find $(prefix) ;: For debugging.
+ test -d $(datadir)/foo
+ test ! -d $(datadir)/gnu-foo
+ test -d $(libdir)/foo
+ test ! -d $(libdir)/gnu-foo
+ test -d $(libexecdir)/foo
+ test ! -d $(libexecdir)/gnu-foo
END
cat > libzap.c <<'END'
@@ -59,29 +80,13 @@ $AUTOMAKE -a
./configure --program-prefix=gnu- --prefix "`pwd`/inst"
-$MAKE install
-find inst # For debugging.
-test -f inst/bin/gnu-foo
-test -x inst/bin/gnu-foo
-test -f inst/share/foo/bar.txt
-test ! -d inst/share/gnu-foo
-test -f inst/lib/foo/libzap.a
-test ! -d inst/lib/gnu-foo
-test -f inst/libexec/foo/gnu-mu
-test -x inst/libexec/foo/gnu-mu
-test ! -d inst/libexec/gnu-foo
+$MAKE test-install
$MAKE uninstall
test `find inst -type f -print | wc -l` = 0
# Opportunistically test for installdirs.
rm -rf inst
-$MAKE installdirs
-test -d inst/share/foo
-test ! -d inst/share/gnu-foo
-test -d inst/lib/foo
-test ! -d inst/lib/gnu-foo
-test -d inst/libexec/foo
-test ! -d inst/libexec/gnu-foo
+$MAKE test-installdirs
:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12-118-gd3b9280,
Stefano Lattarini <=