diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-19 13:09:39 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-19 13:27:34 +0100 |
commit | 78964087335e66e9ae4ad3899bd545b770e30581 (patch) | |
tree | c7d54a7a97e2bdde966d14fbb3c1c176a341e306 /m4 | |
parent | 3f9fc60baa2e7f9324e17a26f592e92148b7117c (diff) | |
parent | caba6a20804021ab607b40ccefece4e77ef72a77 (diff) | |
download | automake-78964087335e66e9ae4ad3899bd545b770e30581.tar.gz |
Merge branch 'micro' into minor
* micro:
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
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
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 4841d5356..1a892132c 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 |