diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-19 11:44:12 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-19 12:23:46 +0100 |
| commit | 0015156bcc4d25db3c5504b29618fe1a02c1e4f6 (patch) | |
| tree | ef4b5c638491aeb562bba04a78d609e4a658fc71 /t | |
| parent | cca600c6c066dbb8a30baff445c5162a11e67a9c (diff) | |
| download | automake-0015156bcc4d25db3c5504b29618fe1a02c1e4f6.tar.gz | |
Make sure AM_INIT_AUTOMAKE has a trailing newline
This used to be the case until Automke 1.13, but we broke it in
Automake 1.14 (see commit v1.13.1-71-gf78b0f0). This caused
issues like http://debbugs.gnu.org/16841
* m4/init.m4 (AM_INIT_AUTOMAKE): Adjust.
* t/aminit-trailing-dnl-comment-pr16841.sh: New test.
* t/list-of-tests.mk: Add it.
* NEWS, THANKS: Update.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't')
| -rw-r--r-- | t/aminit-trailing-dnl-comment-pr16841.sh | 44 | ||||
| -rw-r--r-- | t/list-of-tests.mk | 1 |
2 files changed, 45 insertions, 0 deletions
diff --git a/t/aminit-trailing-dnl-comment-pr16841.sh b/t/aminit-trailing-dnl-comment-pr16841.sh new file mode 100644 index 000000000..0f47f16bf --- /dev/null +++ b/t/aminit-trailing-dnl-comment-pr16841.sh @@ -0,0 +1,44 @@ +#! /bin/sh +# Copyright (C) 2014 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 a trailing 'dnl' m4 comment automake after the +# AM_INIT_AUTOMAKE invocation doesn't produce a syntactically +# invalid configure script. This used to be the case until +# automake 1.13, but we broke that in automake 1.14. See +# automake bug#16841. + +am_create_testdir=empty +. test-init.sh + +cat > configure.ac <<END +AC_INIT([test-pr16841], [1.0]) +AM_INIT_AUTOMAKE([1.14 -Werror]) dnl Some comment +echo "OK OK OK" +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT +END + +: > Makefile.am + +$ACLOCAL +$AUTOCONF +$AUTOMAKE -a + +./configure >stdout || { cat stdout; exit 1; } +cat stdout +greop '^OK OK OK$' stdout + +: diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index 462497ee3..c98d69e11 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -132,6 +132,7 @@ t/amhello-cflags.sh \ t/amhello-cross-compile.sh \ t/amhello-binpkg.sh \ t/aminit-moreargs-deprecation.sh \ +t/aminit-trailing-dnl-comment-pr16841.sh \ t/amassign.sh \ t/am-config-header.sh \ t/am-prog-cc-stdc.sh \ |