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/nodef.sh | |
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/nodef.sh')
-rwxr-xr-x | t/nodef.sh | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/t/nodef.sh b/t/nodef.sh deleted file mode 100755 index 3c55745b3..000000000 --- a/t/nodef.sh +++ /dev/null @@ -1,58 +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/>. - -# Make sure that PACKAGE and VERSION are AC_DEFINEd when requested. - -. ./defs || Exit 1 - -# ------------------------------------------------------------------- -# Do not upgrade this file to use the modern AC_INIT/AM_INIT_AUTOMAKE -# forms. The day these obsolete AC_INIT and AM_INIT_AUTOMAKE forms -# are dropped, just erase the file. -# nodef2.test contains the modern version of this test. -# ------------------------------------------------------------------- - -# First, check that PACKAGE and VERSION are output by default. - -cat > configure.ac << 'END' -AC_INIT -AM_INIT_AUTOMAKE([UnIqUe_PaCkAgE], [UnIqUe_VeRsIoN]) -AC_OUTPUT(output) -END - -echo 'DEFS = @DEFS@' > output.in - -$ACLOCAL -$AUTOCONF -./configure - -grep 'DEFS.*-DVERSION=\\"UnIqUe' output - -# Then, check that PACKAGE and VERSION are not output if requested. - -cat > configure.ac << 'END' -AC_INIT -AM_INIT_AUTOMAKE([UnIqUe_PaCkAgE], [UnIqUe_VeRsIoN], [no]) -AC_OUTPUT(output) -END - -$ACLOCAL -$AUTOCONF -./configure - -grep 'DEFS.*-DVERSION=\\"UnIqUe' output && Exit 1 - -: |