diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-19 13:31:46 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-19 13:31:46 +0100 |
| commit | 682c4456e02d18b40c701da0602b5720a2cb6858 (patch) | |
| tree | b4f366a30facb2d707f1a7a114691cbc17ecf870 /m4 | |
| parent | 4b4d63009aaa057a013cfc5c7e3c7cd0d55f7bfe (diff) | |
| parent | 4179284a3de093f3578a67c9b258a0d91eb4b6be (diff) | |
| download | automake-682c4456e02d18b40c701da0602b5720a2cb6858.tar.gz | |
Merge branch 'minor'
* minor:
Fix stupid typo in test, causing spurious failure
sync: update third-part files from upstream
Make sure AM_INIT_AUTOMAKE has a trailing newline
dist: adjust warning messages about shar and tarZ deprecation
docs: improve description of ${PACKAGE}, ${VERSION}, and similar variables
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/init.m4 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/m4/init.m4 b/m4/init.m4 index 9a80a7ce0..6a1d25e74 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -160,7 +160,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 |