[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.14.1-179-g682c445

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=682c4456e02d18b40c701da0602b5720a2cb6858

The branch, master has been updated
       via  682c4456e02d18b40c701da0602b5720a2cb6858 (commit)
       via  4179284a3de093f3578a67c9b258a0d91eb4b6be (commit)
       via  26aaa1c22db47d2a0ffdb4de79d196164c1e3b18 (commit)
       via  78964087335e66e9ae4ad3899bd545b770e30581 (commit)
       via  caba6a20804021ab607b40ccefece4e77ef72a77 (commit)
       via  c7803af6d7099a002d7684000070ef945bb067b9 (commit)
       via  0015156bcc4d25db3c5504b29618fe1a02c1e4f6 (commit)
       via  cca600c6c066dbb8a30baff445c5162a11e67a9c (commit)
       via  4410ae7f201a1e70da63b95680467223f77dffab (commit)
       via  79c8f00e741771d40478a15c3993e98d22039203 (commit)
      from  4b4d63009aaa057a013cfc5c7e3c7cd0d55f7bfe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 682c4456e02d18b40c701da0602b5720a2cb6858
Merge: 4b4d630 4179284
Author: Stefano Lattarini <address@hidden>
Date:   Fri Dec 19 13:31:46 2014 +0100

    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

-----------------------------------------------------------------------

Summary of changes:
 NEWS                                               |    7 +++-
 THANKS                                             |    2 +
 doc/automake.texi                                  |   31 +++++++++++++------
 lib/config.guess                                   |   11 ++++---
 lib/config.sub                                     |   23 +++++++++++++--
 lib/gitlog-to-changelog                            |    7 ++++-
 m4/init.m4                                         |    6 +++-
 ...1.sh => aminit-trailing-dnl-comment-pr16841.sh} |   29 +++++++++---------
 t/list-of-tests.mk                                 |    1 +
 9 files changed, 80 insertions(+), 37 deletions(-)
 copy t/{auxdir-pr19311.sh => aminit-trailing-dnl-comment-pr16841.sh} (62%)

diff --git a/NEWS b/NEWS
index 5bb46b7..23a9144 100644
--- a/NEWS
+++ b/NEWS
@@ -157,14 +157,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.
+
   - 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 --git a/THANKS b/THANKS
index 6fd7115..3d8dd8f 100644
--- a/THANKS
+++ b/THANKS
@@ -153,11 +153,13 @@ Harlan Stenn                    address@hidden
 He Li                           address@hidden
 Henrik Frystyk Nielsen          address@hidden
 Hib Eris                        address@hidden
+Hilko Bengen                    address@hidden
 Holger Hans Peter Freyther      address@hidden
 Ian Lance Taylor                address@hidden
 Ignacy Gawedzki                 address@hidden
 Илья Н. Голубев                 address@hidden
 Imacat                          address@hidden
+Infirit                         address@hidden
 Inoue                           address@hidden
 Jack Kelly                      address@hidden
 James Amundson                  address@hidden
diff --git a/doc/automake.texi b/doc/automake.texi
index e566f7b..9e7f582 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -3904,12 +3904,15 @@ This usage is mostly obsolete because the @var{package} 
and @var{version}
 can be obtained from Autoconf's @code{AC_INIT} macro.  However,
 differently from what happens for @code{AC_INIT} invocations, this
 @code{AM_INIT_AUTOMAKE} invocation supports shell variables' expansions
-in the @code{PACKAGE} and @code{VERSION} arguments, and this can be
-still be useful in some selected situations.  Our hope is that future
-Autoconf versions will improve their support for package versions
-defined dynamically at configure runtime; when (and if) this happens,
-support for the two-args @code{AM_INIT_AUTOMAKE} invocation will likely
-be removed from Automake.
+in the @code{PACKAGE} and @code{VERSION} arguments (which otherwise
+defaults, respectively, to the @code{PACKAGE_TARNAME} and
address@hidden defined via the @code{AC_INIT} invocation;
address@hidden, , The @code{AC_INIT} macro, autoconf, The Autoconf Manual});
+and this can be still be useful in some selected situations.
+Our hope is that future Autoconf versions will improve their support
+for package versions defined dynamically at configure runtime; when
+(and if) this happens, support for the two-args @code{AM_INIT_AUTOMAKE}
+invocation will likely be removed from Automake.
 
 @anchor{Modernize AM_INIT_AUTOMAKE invocation}
 If your @file{configure.ac} has:
@@ -8359,9 +8362,13 @@ We recommend that you follow this same set of heuristics 
in your
 The @code{dist} rule in the generated @file{Makefile.in} can be used
 to generate a gzipped @code{tar} file and other flavors of archive for
 distribution.  The file is named based on the @code{PACKAGE} and
address@hidden variables defined by @code{AM_INIT_AUTOMAKE}
-(@pxref{Macros}); more precisely the gzipped @code{tar} file is named
address@hidden@address@hidden
address@hidden variables automatically defined by either the
address@hidden invocation or by a @emph{deprecated} two-arguments
+invocation of the @code{AM_INIT_AUTOMAKE} macro (see @ref{Public Macros}
+for how these variables get their values, from either defaults or explicit
+values -- it's slightly trickier than one would expect).
+More precisely the gzipped @code{tar} file is named
address@hidden@address@hidden@address@hidden
 @vindex GZIP_ENV
 You can use the @command{make} variable @code{GZIP_ENV} to control how gzip
 is run.  The default setting is @option{--best}.
@@ -10082,7 +10089,11 @@ brittle.
 @opindex no-define
 This option is meaningful only when passed as an argument to
 @code{AM_INIT_AUTOMAKE}.  It will prevent the @code{PACKAGE} and
address@hidden variables from being @code{AC_DEFINE}d.
address@hidden variables from being @code{AC_DEFINE}d.  But notice
+that they will remain defined as shell variables in the generated
address@hidden, and as make variables in the generated
address@hidden; this is deliberate, and required for backward
+compatibility.
 
 @item @option{no-dependencies}
 @cindex Option, @option{no-dependencies}
diff --git a/lib/config.guess b/lib/config.guess
index 1f5c50c..6c32c86 100755
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2014-03-23'
+timestamp='2014-11-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@ timestamp='2014-03-23'
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
 # 
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 #
-# Please send patches with a ChangeLog entry to address@hidden
+# Please send patches to <address@hidden>.
 
 
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -579,8 +579,9 @@ EOF
        else
                IBM_ARCH=powerpc
        fi
-       if [ -x /usr/bin/oslevel ] ; then
-               IBM_REV=`/usr/bin/oslevel`
+       if [ -x /usr/bin/lslpp ] ; then
+               IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+                          awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
        else
                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
        fi
diff --git a/lib/config.sub b/lib/config.sub
index 6acbfac..7ffe373 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2014-04-03'
+timestamp='2014-12-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ timestamp='2014-04-03'
 # of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches with a ChangeLog entry to address@hidden
+# Please send patches to <address@hidden>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -283,8 +283,10 @@ case $basic_machine in
        | mips64vr5900 | mips64vr5900el \
        | mipsisa32 | mipsisa32el \
        | mipsisa32r2 | mipsisa32r2el \
+       | mipsisa32r6 | mipsisa32r6el \
        | mipsisa64 | mipsisa64el \
        | mipsisa64r2 | mipsisa64r2el \
+       | mipsisa64r6 | mipsisa64r6el \
        | mipsisa64sb1 | mipsisa64sb1el \
        | mipsisa64sr71k | mipsisa64sr71kel \
        | mipsr5900 | mipsr5900el \
@@ -300,6 +302,7 @@ case $basic_machine in
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle \
        | pyramid \
+       | riscv32 | riscv64 \
        | rl78 | rx \
        | score \
        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | 
shbe | shle | sh[1234]le | sh3ele \
@@ -310,6 +313,7 @@ case $basic_machine in
        | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
        | ubicom32 \
        | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+       | visium \
        | we32k \
        | x86 | xc16x | xstormy16 | xtensa \
        | z8k | z80)
@@ -324,6 +328,9 @@ case $basic_machine in
        c6x)
                basic_machine=tic6x-unknown
                ;;
+       leon|leon[3-9])
+               basic_machine=sparc-$basic_machine
+               ;;
        m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
                basic_machine=$basic_machine-unknown
                os=-none
@@ -401,8 +408,10 @@ case $basic_machine in
        | mips64vr5900-* | mips64vr5900el-* \
        | mipsisa32-* | mipsisa32el-* \
        | mipsisa32r2-* | mipsisa32r2el-* \
+       | mipsisa32r6-* | mipsisa32r6el-* \
        | mipsisa64-* | mipsisa64el-* \
        | mipsisa64r2-* | mipsisa64r2el-* \
+       | mipsisa64r6-* | mipsisa64r6el-* \
        | mipsisa64sb1-* | mipsisa64sb1el-* \
        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
        | mipsr5900-* | mipsr5900el-* \
@@ -432,6 +441,7 @@ case $basic_machine in
        | ubicom32-* \
        | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
        | vax-* \
+       | visium-* \
        | we32k-* \
        | x86-* | x86_64-* | xc16x-* | xps100-* \
        | xstormy16-* | xtensa*-* \
@@ -769,6 +779,9 @@ case $basic_machine in
                basic_machine=m68k-isi
                os=-sysv
                ;;
+       leon-*|leon[3-9]-*)
+               basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+               ;;
        m68knommu)
                basic_machine=m68k-unknown
                os=-linux
@@ -824,6 +837,10 @@ case $basic_machine in
                basic_machine=powerpc-unknown
                os=-morphos
                ;;
+       moxiebox)
+               basic_machine=moxie-unknown
+               os=-moxiebox
+               ;;
        msdos)
                basic_machine=i386-pc
                os=-msdos
@@ -1369,7 +1386,7 @@ case $os in
              | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* 
\
              | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
              | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-             | -uxpv* | -beos* | -mpeix* | -udk* \
+             | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
diff --git a/lib/gitlog-to-changelog b/lib/gitlog-to-changelog
index 78afff4..190f7b5 100755
--- a/lib/gitlog-to-changelog
+++ b/lib/gitlog-to-changelog
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
     if 0;
 # Convert git log output to ChangeLog format.
 
-my $VERSION = '2012-07-29 06:11'; # UTC
+my $VERSION = '2014-11-20 17:25'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -72,6 +72,7 @@ OPTIONS:
                   directory can be derived.
    --since=DATE convert only the logs since DATE;
                   the default is to convert all log entries.
+   --until=DATE convert only the logs older than DATE.
    --format=FMT set format string for commit subject and body;
                   see 'man git-log' for the list of format metacharacters;
                   the default is '%s%n%b%n'
@@ -220,6 +221,7 @@ sub git_dir_option($)
 
 {
   my $since_date;
+  my $until_date;
   my $format_string = '%s%n%b%n';
   my $amend_file;
   my $append_dot = 0;
@@ -232,6 +234,7 @@ sub git_dir_option($)
      help => sub { usage 0 },
      version => sub { print "$ME version $VERSION\n"; exit },
      'since=s' => \$since_date,
+     'until=s' => \$until_date,
      'format=s' => \$format_string,
      'amend=s' => \$amend_file,
      'append-dot' => \$append_dot,
@@ -243,6 +246,8 @@ sub git_dir_option($)
 
   defined $since_date
     and unshift @ARGV, "--since=$since_date";
+  defined $until_date
+    and unshift @ARGV, "--until=$until_date";
 
   # This is a hash that maps an SHA1 to perl code (i.e., s/old/new/)
   # that makes a correction in the log or attribution of that commit.
diff --git a/m4/init.m4 b/m4/init.m4
index 9a80a7c..6a1d25e 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
diff --git a/t/auxdir-pr19311.sh b/t/aminit-trailing-dnl-comment-pr16841.sh
similarity index 62%
copy from t/auxdir-pr19311.sh
copy to t/aminit-trailing-dnl-comment-pr16841.sh
index 56c71a1..fc73ebe 100644
--- a/t/auxdir-pr19311.sh
+++ b/t/aminit-trailing-dnl-comment-pr16841.sh
@@ -14,32 +14,31 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Automake bug#19311: AC_PROG_CC called before AC_CONFIG_AUX_DIR can
-# silently force wrong $ac_aux_dir definition.
+# 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
-required=cc
 . test-init.sh
 
 cat > configure.ac <<END
-AC_INIT([$me], [1.0])
-AC_PROG_CC
-AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE
-AC_OUTPUT([Makefile])
+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
 
-mkdir build-aux
-
 $ACLOCAL
-$AUTOMAKE -a
 $AUTOCONF
+$AUTOMAKE -a
 
-test -f build-aux/compile
-test -f build-aux/install-sh
-
-./configure
+./configure >stdout || { cat stdout; exit 1; }
+cat stdout
+grep '^OK OK OK$' stdout
 
 :
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 2616922..12b74e3 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -135,6 +135,7 @@ t/amhello-cflags.sh \
 t/amhello-cross-compile.sh \
 t/amhello-binpkg.sh \
 t/aminit-moreargs-deprecation.sh \
+t/aminit-trailing-dnl-comment-pr16841.sh \
 t/amassign.sh \
 t/am-config-header.sh \
 t/am-prog-cc-stdc.sh \


hooks/post-receive
-- 
GNU Automake