From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 19 Dec 2014 12:09:39 +0000 (+0100)
Subject: Merge branch 'micro' into minor
X-Git-Tag: v1.15~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78964087335e66e9ae4ad3899bd545b770e30581;p=thirdparty%2Fautomake.git

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>
---

78964087335e66e9ae4ad3899bd545b770e30581
diff --cc NEWS
index b008a015c,626d295ac..2e7f31fda
--- a/NEWS
+++ b/NEWS
@@@ -99,14 -108,8 +99,17 @@@ New in 1.15
  
  * Bugs fixed:
  
+   - The expansion of AM_INIT_AUTOMAKE ends once again with a trailing
 -    newline (bug#16841). Regression introduced in Automake 1.14.
++    newline (bug#16841).  Regression introduced in Automake 1.14.
++
 +  - The user can now extend the special .PRECIOUS target, the same way
 +    he could already do with the .MAKE .and .PHONY targets.
 +
 +  - Fixed confusing typos in the manual and in some warning messages
 +    (automake bug#16827 and bug#16997).
 +
-   - We no longer risk to use '$ac_aux_dir' before it's defined.  See
-     automake bug#15981.
++  - We no longer risk to use '$ac_aux_dir' before it's defined (see
++    automake bug#15981). Bug introduced in Automake 1.14.
  
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
diff --cc THANKS
index 6fd71150c,9ace719e5..3d8dd8f5d
--- a/THANKS
+++ b/THANKS
@@@ -153,7 -152,7 +153,8 @@@ Harlan Stenn                    Harlan.
  He Li                           tippa000@yahoo.com
  Henrik Frystyk Nielsen          frystyk@w3.org
  Hib Eris                        hib@hiberis.nl
+ Hilko Bengen                    bengen@debian.org
 +Holger Hans Peter Freyther      holger@freyther.de
  Ian Lance Taylor                ian@cygnus.com
  Ignacy Gawedzki                 i@lri.fr
  Илья Н. Голубев                 gin@mo.msk.ru
diff --cc t/aminit-trailing-dnl-comment-pr16841.sh
index 000000000,0f47f16bf..fc73ebead
mode 000000,100644..100644
--- a/t/aminit-trailing-dnl-comment-pr16841.sh
+++ b/t/aminit-trailing-dnl-comment-pr16841.sh
@@@ -1,0 -1,44 +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
++grep '^OK OK OK$' stdout
+ 
+ :