[SCM] GNU Autoconf source repository branch, master, updated. v2.67-13-gc40eb4b

[Ralf Wildenhues]

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 Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=c40eb4bc723e3b0131f0d05d86484d358ab0dd7e

The branch, master has been updated
       via  c40eb4bc723e3b0131f0d05d86484d358ab0dd7e (commit)
      from  a11cc13e77e96cf40b6060dd8384a00ff110b846 (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 c40eb4bc723e3b0131f0d05d86484d358ab0dd7e
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Aug 4 21:04:05 2010 +0200

    Fix testsuite failure due to bugs in third-party aclocal macros.
    
    * tests/torture.at (Non-literal AC_CONFIG_SUBDIRS): Create a
    hand-written aclocal.m4 file, so the -Werror test doesn't fail
    over aclocal warnings about errors in third-party macro files.
    Simplify test accordingly, calling autoreconf throughout.
    Report by Bob Friesenhahn.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog        |    7 +++++++
 tests/torture.at |   12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d5973dc..9ea06cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-08-04  Ralf Wildenhues  <address@hidden>
 
+       Fix testsuite failure due to bugs in third-party aclocal macros.
+       * tests/torture.at (Non-literal AC_CONFIG_SUBDIRS): Create a
+       hand-written aclocal.m4 file, so the -Werror test doesn't fail
+       over aclocal warnings about errors in third-party macro files.
+       Simplify test accordingly, calling autoreconf throughout.
+       Report by Bob Friesenhahn.
+
        Fix AC_LANG_SOURCE and AC_LANG_PROGRAM tests.
        * tests/compile.at (AC_LANG_SOURCE example)
        (AC_LANG_PROGRAM example): Fix broken sed script for
diff --git a/tests/torture.at b/tests/torture.at
index ff05928..97cb5c6 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1708,9 +1708,6 @@ AT_CLEANUP
 AT_SETUP([Non-literal AC_CONFIG_SUBDIRS])
 AT_KEYWORDS([autoreconf])
 
-# We use aclocal (via autoreconf).
-AT_CHECK([aclocal --version || exit 77], [], [ignore], [ignore])
-
 AT_DATA([install-sh], [])
 AT_DATA([configure.in],
 [[AC_INIT(GNU Outer, 1.0)
@@ -1724,6 +1721,11 @@ AC_CONFIG_SUBDIRS([$my_subdirs])
 AC_OUTPUT
 ]])
 
+# Hand-written aclocal.m4, so we don't invoke `aclocal -Werror' which
+# could barf over warnings in third-party macro files, or fail over
+# warnings with older aclocal which didn't yet understand -W*.
+AT_DATA([aclocal.m4])
+
 AS_MKDIR_P([foo])
 
 AT_DATA([foo/configure],
@@ -1738,9 +1740,7 @@ AT_CHECK([autoreconf -Werror -v], [1], [ignore], [stderr])
 AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [0], [ignore])
 AT_CHECK([autoreconf -v], [0], [ignore], [stderr])
 AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [0], [ignore])
-# We cannot assume aclocal won't warn (aclocal-1.9 does not understand -W*
-# options), so check autoconf only.
-AT_CHECK([autoconf --force -Wno-syntax], 0, [ignore], [stderr])
+AT_CHECK([autoreconf -v --force -Wno-syntax], 0, [ignore], [stderr])
 AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [1])
 
 AT_CHECK([./configure $configure_options], [0], [ignore])


hooks/post-receive
-- 
GNU Autoconf source repository