[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-501-g94ad7e4

[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=94ad7e48dc63321ca334e71c0f87dc3eada8ffd6

The branch, maint has been updated
       via  94ad7e48dc63321ca334e71c0f87dc3eada8ffd6 (commit)
       via  02ab80cebbb9efc1e3dfbd3034dc517f3c5e099d (commit)
      from  ae412c3817a7fe6d553863c0b2a825bd400e4b76 (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 94ad7e48dc63321ca334e71c0f87dc3eada8ffd6
Merge: ae412c3 02ab80c
Author: Stefano Lattarini <address@hidden>
Date:   Mon Oct 17 17:46:05 2011 +0200

    Merge branch 'aclocal-path' into maint

commit 02ab80cebbb9efc1e3dfbd3034dc517f3c5e099d
Author: Stefano Lattarini <address@hidden>
Date:   Mon Oct 17 17:45:41 2011 +0200

    tests: fix spurious failure with autoconf 2.62
    
    * tests/aclocal-path-precedence.test: Rewrite configure.in,
    rather than appending to it, to avoid spurious failures (at
    least with autoconf 2.62) due to repeated calls to AC_INIT.
    Also, add package name and version arguments to AC_INIT, to
    avoid spurious errors from automake.

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

Summary of changes:
 ChangeLog                          |    9 +++++++++
 tests/aclocal-path-precedence.test |    4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2c7ec7d..a2ecefc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-17  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failure with autoconf 2.62
+       * tests/aclocal-path-precedence.test: Rewrite configure.in,
+       rather than appending to it, to avoid spurious failures (at
+       least with autoconf 2.62) due to repeated calls to AC_INIT.
+       Also, add package name and version arguments to AC_INIT, to
+       avoid spurious errors from automake.
+
 2011-10-16  Stefano Lattarini  <address@hidden>
 
        docs: avoid using colon character inside arguments of @pxref
diff --git a/tests/aclocal-path-precedence.test 
b/tests/aclocal-path-precedence.test
index b170dd5..c02fd3b 100755
--- a/tests/aclocal-path-precedence.test
+++ b/tests/aclocal-path-precedence.test
@@ -21,8 +21,8 @@ am_create_testdir=empty
 
 set -e
 
-cat >> configure.in << 'END'
-AC_INIT
+cat > configure.in << END
+AC_INIT([$me], [1.0])
 AM_INIT_AUTOMAKE([parallel-tests])
 FOO_MACRO
 BAR_MACRO


hooks/post-receive
-- 
GNU Automake