[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.13.1d-167-g7010b65

[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=7010b652966b23567be6e099d6e1c2e01441f213

The branch, master has been updated
       via  7010b652966b23567be6e099d6e1c2e01441f213 (commit)
       via  92aa1e944b01a176a49d63f9481294d506f36d2f (commit)
       via  2ad0acea7f3114a3a1e0954154c743c14c2cfab1 (commit)
       via  1667d369091fe41d2bbdf645490a29d45142556f (commit)
       via  57cb996d881ed6e835c2e6e1a5769e7fa9f1a6d0 (commit)
       via  799fa256e63bb1a3aa409b7c8a0d4906d829dba9 (commit)
       via  3e6cad967e30acdc97a26a168021be349d06db25 (commit)
       via  8a11e2fd135fae4626cbb1cc1b4b8dd45efc3feb (commit)
       via  481c9975556b178a3aa095a808b9c7a87a24c426 (commit)
       via  9c813963e2f67cbf4604a1a1947c2ff779ecc8f0 (commit)
      from  e2fd8f5c0c90d9894713e34be7ae8e8774c471da (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 7010b652966b23567be6e099d6e1c2e01441f213
Author: Stefano Lattarini <address@hidden>
Date:   Sun May 5 01:09:20 2013 +0200

    fixlet: remove leftover comment fragment
    
    * configure.ac: Here.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 92aa1e944b01a176a49d63f9481294d506f36d2f
Author: Stefano Lattarini <address@hidden>
Date:   Sun May 5 00:58:00 2013 +0200

    master branch: we are going to become Automake 2.0
    
    * configure.ac (AC_INIT): So adjust the beta version in here, from
    1.13a to 1.99a.
    * m4/amversion.m4: Regenerate.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 2ad0acea7f3114a3a1e0954154c743c14c2cfab1
Merge: e2fd8f5 1667d36
Author: Stefano Lattarini <address@hidden>
Date:   Sun May 5 00:55:26 2013 +0200

    Merge branch 'maint'
    
    * maint:
      maint branch: we are going to become Automake 1.14
      maint: version bump after beta release 1.13.1d
      release: beta release 1.13.1d (will become 1.13.2)
      NEWS: document more robust handling/recognition of make options
      tests: typofixes in comments in t/preproc-c-compile.sh
      tests: remove bashism from a test

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

Summary of changes:
 NEWS                   |   10 ++++++++++
 configure.ac           |    3 +--
 m4/amversion.m4        |    6 +++---
 t/preproc-c-compile.sh |    4 ++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index 8866502..56a3eb4 100644
--- a/NEWS
+++ b/NEWS
@@ -278,6 +278,16 @@ New in 1.13.2:
     m4 files (as can happen with e.g., "libtoolize --install").
     See automake bug#13514.
 
+  - Analysis of make flags in Automake-generated rules has been made more
+    robust, and more future-proof.  For example, in presence of make that
+    (like '-I') take an argument, the characters in said argument will no
+    longer be spuriously considered as a set of additional make options.
+    In particular, automake-generated rules will no longer spuriously
+    believe to be running in dry mode ("make -n") if run with an invocation
+    like "make -I noob"; nor will they believe to be running in keep-going
+    mode ("make -k") if run with an invocation like "make -I kool"
+    (automake bug#12554).
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 New in 1.13.1:
diff --git a/configure.ac b/configure.ac
index 9984250..497c2b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.69])
-AC_INIT([GNU Automake], [1.13a], address@hidden)
+AC_INIT([GNU Automake], [1.99a], address@hidden)
 
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])
@@ -176,7 +176,6 @@ AC_MSG_RESULT([$result])
 # FIXME: for file systems with sub-second timestamp resolutions, this
 # FIXME: might be just one second (or even less if 'sleep' supports
 # FIXME: non-integer arguments); is it worth pursuing that road?
-# than another we wait at least 5 seconds between creations.
 AC_SUBST([MODIFICATION_DELAY], [2])
 
 ## ------------------------------------------- ##
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index e8e5e36..708ed3e 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -12,10 +12,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.13a'
+[am__api_version='1.99a'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.13a], [],
+m4_if([$1], [1.99a], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -31,7 +31,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.13a])dnl
+[AM_AUTOMAKE_VERSION([1.99a])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/t/preproc-c-compile.sh b/t/preproc-c-compile.sh
index 79e9325..7c398a8 100755
--- a/t/preproc-c-compile.sh
+++ b/t/preproc-c-compile.sh
@@ -68,7 +68,7 @@ bin_PROGRAMS =
 include $(top_srcdir)/zot/local.mk
 
 test:
-       test '$(bin_PROGRAMS)' == mumble$(EXEEXT)
+       test '$(bin_PROGRAMS)' = mumble$(EXEEXT)
        test '$(mumble_SOURCES)' = one.c
 check-local: test
 END
@@ -111,7 +111,7 @@ fi
 # GNU install refuses to override a just-installed file; since we
 # have plenty of 'mumble' dummy programs to install in the same
 # location, such "overridden installations" are not a problem for
-# us, so just force the use the 'install-sh' script
+# us; so just force the use the 'install-sh' script.
 ac_cv_path_install=$(pwd)/install-sh; export ac_cv_path_install
 $MAKE distcheck
 


hooks/post-receive
-- 
GNU Automake