summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2014-12-19 11:44:12 +0100
committerStefano Lattarini <stefano.lattarini@gmail.com>2014-12-19 12:23:46 +0100
commit0015156bcc4d25db3c5504b29618fe1a02c1e4f6 (patch)
treeef4b5c638491aeb562bba04a78d609e4a658fc71 /m4
parentcca600c6c066dbb8a30baff445c5162a11e67a9c (diff)
downloadautomake-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 'm4')
-rw-r--r--m4/init.m46
1 files changed, 5 insertions, 1 deletions
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