From 0015156bcc4d25db3c5504b29618fe1a02c1e4f6 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 19 Dec 2014 11:44:12 +0100 Subject: 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 --- m4/init.m4 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'm4') diff --git a/m4/init.m4 b/m4/init.m4 index 432ff200c..d8350fe44 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -164,7 +164,11 @@ to "yes", and re-run configure. END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -- cgit v1.2.1