diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-19 11:47:26 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-25 14:46:05 +0200 |
| commit | e186355f246be84a48c1113dc528d689c1d4b717 (patch) | |
| tree | bf8b7739b69570b68902ef3eec05ec66041bd6d3 /t/ac-output-old.tap | |
| parent | 27136dfe02926ac596c853fced7c17825ef3cf68 (diff) | |
| download | automake-e186355f246be84a48c1113dc528d689c1d4b717.tar.gz | |
init: obsolete usages of AM_INIT_AUTOMAKE not supported anymore
This is a follow-up on commit v1.12-66-g27136df of 2012-05-06, "init: warn
against obsolete usage of AM_INIT_AUTOMAKE".
With this change, we drop support for the two-arguments and three-arguments
invocation forms of the AM_INIT_AUTOMAKE macro, as in either of:
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, NODEFINE)
* NEWS, doc/automake.texi: Update.
* m4/init.m4 (AM_INIT_AUTOMAKE): Report the two- and three-arguments
invocation form as a hard error.
* t/aminit-moreargs-deprecation.sh: Renamed ...
* t/aminit-moreargs-deprecation.sh: ... to this, and updated to check
the new semantics.
* t/ac-output-old.tap: Adjust by avoiding old-style uses of AC_INIT
and AM_INIT_AUTOMAKE.
* t/acsilent.sh: Likewise.
* t/dirlist.sh: Likewise.
* t/dirlist2.sh: Likewise.
* t/req.sh: Likewise.
* t/nodef.sh: Remove as obsolete.
* t/version.sh: Likewise.
* t/version2.sh: Likewise.
* t/backcompat.sh: Likewise.
* t/backcompat2.sh: Likewise.
* t/backcompat3.sh: Likewise.
* t/backcompat5.sh: Likewise.
* t/backcompat4.sh: Renamed ...
* t/backcompat-acout.sh: ... to this.
* t/list-of-tests.mk: Adjust.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/ac-output-old.tap')
| -rwxr-xr-x | t/ac-output-old.tap | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/t/ac-output-old.tap b/t/ac-output-old.tap index 5ba3d3e3a..7a4d762e3 100755 --- a/t/ac-output-old.tap +++ b/t/ac-output-old.tap @@ -24,8 +24,6 @@ plan_ 22 rm -f configure.ac depcomp # Not required. -AUTOMAKE="$AUTOMAKE -Wno-obsolete" - # ----------------------------------------------------------------------- # Test for bug reported by François Pinard. @@ -54,18 +52,15 @@ acoutbs_check () } acoutbs_check 1 << 'END' -AC_INIT -AM_INIT_AUTOMAKE(nonesuch, nonesuch) +AC_INIT([acoutbs1], [1.0]) +AM_INIT_AUTOMAKE AC_OUTPUT(Makefile \ zot) END acoutbs_check 2 << 'END' -AC_INIT -AM_INIT_AUTOMAKE(nonesuch, nonesuch) -AC_ARG_PROGRAM -AC_PROG_INSTALL -AC_PROG_MAKE_SET +AC_INIT([acoutbs2], [1.0]) +AM_INIT_AUTOMAKE AC_OUTPUT(\ Makefile \ zot @@ -85,8 +80,8 @@ mkdir acoutnoq cd acoutnoq cat > configure.ac << 'END' -AC_INIT -AM_INIT_AUTOMAKE(nonesuch, nonesuch) +AC_INIT([acoutnoq], [1.0]) +AM_INIT_AUTOMAKE AC_OUTPUT(Makefile, [true]) END @@ -107,8 +102,8 @@ mkdir acoutpt cd acoutpt cat > configure.ac << 'END' -AC_INIT -AM_INIT_AUTOMAKE(nonesuch, nonesuch) +AC_INIT([acoutpt], [1.0]) +AM_INIT_AUTOMAKE AC_OUTPUT([Makefile], [true]) END @@ -163,8 +158,8 @@ mkdir acoutqnl cd acoutqnl cat > configure.ac << 'END' -AC_INIT -AM_INIT_AUTOMAKE(nonesuch, nonesuch) +AC_INIT([acoutqnl], [1.0]) +AM_INIT_AUTOMAKE AC_OUTPUT([Makefile], [echo zardoz has spoken]) END |