[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.6

[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=28fcb35dc73d363ed2a5fe4eddf26770212496c9

The branch, maint has been updated
       via  28fcb35dc73d363ed2a5fe4eddf26770212496c9 (commit)
       via  9ca75479a7b18b2f5f9bfd78ad6168385acf42e9 (commit)
       via  c20ee33f6a8946abeca1f26671e03d5c1af42599 (commit)
       via  93adb7b2c632120646af7863ba07750274127153 (commit)
      from  0093d5e3eb56afd4da47cf7b54a68aae3ffddad3 (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 28fcb35dc73d363ed2a5fe4eddf26770212496c9
Author: Stefano Lattarini <address@hidden>
Date:   Sat Dec 15 10:37:49 2012 +0100

    release: stable release 1.12.5
    
    * configure.ac (AC_INIT): Bump version number to 1.12.5.
    * m4/amversion.m4: Likewise (auto-updated by "make bootstrap").
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 9ca75479a7b18b2f5f9bfd78ad6168385acf42e9
Author: Stefano Lattarini <address@hidden>
Date:   Fri Dec 14 18:22:33 2012 +0100

    tests: avoid errors due to underquoted third-party macros
    
    * t/pkg-config-macros.sh: Call aclocal with the warnings in the
    "syntax" category disabled.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit c20ee33f6a8946abeca1f26671e03d5c1af42599
Author: Stefano Lattarini <address@hidden>
Date:   Fri Dec 14 17:57:25 2012 +0100

    maintcheck: also consider contrib tests for syntax checks
    
    * syntax-checks.mk (xtests): By listing them here.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 93adb7b2c632120646af7863ba07750274127153
Author: Stefano Lattarini <address@hidden>
Date:   Fri Dec 14 17:55:09 2012 +0100

    cosmetics: whitespace fixlets in syntax-checks.mk
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 configure.ac           |    2 +-
 m4/amversion.m4        |    4 ++--
 syntax-checks.mk       |   16 ++++++++--------
 t/pkg-config-macros.sh |    2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5582a51..7670d58 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.12.5a], address@hidden)
+AC_INIT([GNU Automake], [1.12.6], address@hidden)
 
 AC_CONFIG_SRCDIR([automake.in])
 AC_CONFIG_AUX_DIR([lib])
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index d9c4224..8f07860 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -15,7 +15,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.12'
 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.12.5a], [],
+m4_if([$1], [1.12.6], [],
       [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.12.5a])dnl
+[AM_AUTOMAKE_VERSION([1.12.6])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/syntax-checks.mk b/syntax-checks.mk
index 9a8a7e7..204a128 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -27,7 +27,7 @@ xtests := $(shell \
    fi; \
    for d in $$dirs; do \
      for s in tap sh; do \
-       ls $$d/t/*.$$s $$d/t/ax/*.$$s 2>/dev/null; \
+       ls $$d/t/ax/*.$$s $$d/t/*.$$s $$d/contrib/t/*.$$s 2>/dev/null; \
      done; \
    done | sort)
 
@@ -104,7 +104,7 @@ sc_diff_automake sc_diff_aclocal: sc_diff_% :
 sc_no_brace_variable_expansions:
        @if grep -v '^ *#' $(ams) | grep -F '$${' | grep -F -v '$$$$'; then \
          echo "Found too many uses of '\$${' in the lines above." 1>&2; \
-         exit 1;                               \
+         exit 1; \
        else :; fi
 
 ## Make sure 'rm' is called with '-f'.
@@ -114,7 +114,7 @@ sc_rm_minus_f:
           | grep -E '\<rm ([^-]|\-[^f ]*\>)'; \
        then \
          echo "Suspicious 'rm' invocation." 1>&2; \
-         exit 1;                               \
+         exit 1; \
        else :; fi
 
 ## Never use something like "for file in $(FILES)", this doesn't work
@@ -355,16 +355,16 @@ sc_tests_overriding_macros_on_cmdline:
 # code paths.
        @tests=`for t in $(xtests); do \
                  case $$t in */make-dryrun.sh);; *) echo $$t;; esac; \
-               done`; \
+               done`; \
        if sed -e 's/ || .*//' -e 's/ && .*//' \
                -e 's/ DESTDIR=[^ ]*/ /' -e 's/ SHELL=[^ ]*/ /' \
                -e 's/ V=[^ ]*/ /' -e 's/ DISABLE_HARD_ERRORS=[^ ]*/ /' \
                -e "s/ DISTCHECK_CONFIGURE_FLAGS='[^']*'/ /" \
-               -e 's/ DISTCHECK_CONFIGURE_FLAGS="[^"]*"/ /' \
-               -e 's/ DISTCHECK_CONFIGURE_FLAGS=[^ ]/ /' \
+               -e 's/ DISTCHECK_CONFIGURE_FLAGS="[^"]*"/ /' \
+               -e 's/ DISTCHECK_CONFIGURE_FLAGS=[^ ]/ /' \
                -e "s/ exp='[^']*'/ /" \
-               -e 's/ exp="[^"]*"/ /' \
-               -e 's/ exp=[^ ]/ /' \
+               -e 's/ exp="[^"]*"/ /' \
+               -e 's/ exp=[^ ]/ /' \
              $$tests | grep '\$$MAKE .*='; then \
          echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e" in the above 
lines,' 1>&2; \
          echo 'it is more portable.' 1>&2; \
diff --git a/t/pkg-config-macros.sh b/t/pkg-config-macros.sh
index 06a65e3..ddc6f8d 100755
--- a/t/pkg-config-macros.sh
+++ b/t/pkg-config-macros.sh
@@ -68,7 +68,7 @@ 
XT_ACLOCAL_PATH=$XT_ACLOCAL_PATH${ACLOCAL_PATH+":$ACLOCAL_PATH"}
 
 # Try once again to fetch the pkg-config macros.
 mkdir m4
-ACLOCAL_PATH=$XT_ACLOCAL_PATH $ACLOCAL --install -I m4
+ACLOCAL_PATH=$XT_ACLOCAL_PATH $ACLOCAL -Wno-syntax --install -I m4
 if test -f m4/pkg.m4 && have_pkg_config_macros; then
    echo "ACLOCAL_PATH='$(pwd)/m4':\$ACLOCAL_PATH" >> get.sh
    echo "export ACLOCAL_PATH" >> get.sh


hooks/post-receive
-- 
GNU Automake