[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-564-g63da492

[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=63da4921d542b2c329cf95f58c955b9972c5d161

The branch, maint has been updated
       via  63da4921d542b2c329cf95f58c955b9972c5d161 (commit)
       via  fb49574d11f61b23b2a25a81e032df7cc5c9b296 (commit)
       via  d2b76f88a2214b15344a00b4100e5f3b87d97198 (commit)
      from  30bd6d1e53fbc31ef3431893e4db3efe9ad799ee (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 63da4921d542b2c329cf95f58c955b9972c5d161
Author: Stefano Lattarini <address@hidden>
Date:   Fri Dec 16 11:12:31 2011 +0100

    test defs: hack to support autoconf-wrapper programs
    
    * tests/defs.in ($AUTOCONF): Add a dummy `-B' option to the
    autoconf invocation, so that, when the Debian autoconf wrapper
    is involved, it will correctly dispatch an autoconf >= 2.50
    instead of defaulting to autoconf 2.13.
    ($AUTOHEADER, $AUTORECONF): Likewise, but for autoheader and
    autoreconf respectively.
    
    Reported by Bruno Haible:
    <http://lists.gnu.org/archive/html/automake/2011-12/msg00039.html>

commit fb49574d11f61b23b2a25a81e032df7cc5c9b296
Author: Stefano Lattarini <address@hidden>
Date:   Fri Dec 16 01:46:14 2011 +0100

    tests: fix a minor spurious failure with FreeBSD make
    
    * tests/remake-am-pr10111.test: Avoid using `#' comments in
    makefile recipes, as these have been confusing FreeBSD make.
    The failure was masked by the fact that this test is currently
    expected to fail.
    
    Suggested by a report from Bruno Haible.

commit d2b76f88a2214b15344a00b4100e5f3b87d97198
Author: Stefano Lattarini <address@hidden>
Date:   Fri Dec 16 01:22:57 2011 +0100

    tests: make two test scripts executable
    
    * tests/remake-am-pr10111.test: Make executable.
    * tests/remake-m4-pr10111.test: Likewise.

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

Summary of changes:
 ChangeLog                    |   27 +++++++++++++++++++++++++++
 tests/defs.in                |   11 +++++++++++
 tests/remake-am-pr10111.test |    6 +++---
 3 files changed, 41 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 tests/remake-am-pr10111.test
 mode change 100644 => 100755 tests/remake-m4-pr10111.test

diff --git a/ChangeLog b/ChangeLog
index 95da64b..9f9b3cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2011-12-16  Stefano Lattarini  <address@hidden>
+
+       test defs: hack to support autoconf-wrapper programs
+       * tests/defs.in ($AUTOCONF): Add a dummy `-B' option to the
+       autoconf invocation, so that, when the Debian autoconf wrapper
+       is involved, it will correctly dispatch an autoconf >= 2.50
+       instead of defaulting to autoconf 2.13.
+       ($AUTOHEADER, $AUTORECONF): Likewise, but for autoheader and
+       autoreconf respectively.
+       Reported by Bruno Haible:
+       <http://lists.gnu.org/archive/html/automake/2011-12/msg00039.html>
+
+2011-12-16  Stefano Lattarini  <address@hidden>
+
+       tests: fix a minor spurious failure with FreeBSD make
+       * tests/remake-am-pr10111.test: Avoid using `#' comments in
+       makefile recipes, as these have been confusing FreeBSD make.
+       The failure was masked by the fact that this test is currently
+       expected to fail.
+       Suggested by a report from Bruno Haible.
+
+2011-12-16  Stefano Lattarini  <address@hidden>
+
+       tests: make two test scripts executable
+       * tests/remake-am-pr10111.test: Make executable.
+       * tests/remake-m4-pr10111.test: Likewise.
+
 2011-12-14  Stefano Lattarini  <address@hidden>
 
        readme: reference webpages for automake mailing lists
diff --git a/tests/defs.in b/tests/defs.in
index f24d2ad..b19b121 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -103,6 +103,17 @@ test -z "$AUTORECONF" && AUTORECONF="@am_AUTORECONF@"
 test -z "$AUTOHEADER" && AUTOHEADER="@am_AUTOHEADER@"
 test -z "$AUTOUPDATE" && AUTOUPDATE="@am_AUTOUPDATE@"
 test -z "$MISSING" && MISSING=`pwd`/../lib/missing
+
+# This is a hack to seamlessly support the infamous "autoconf wrappers",
+# that might dispatch different autoconf versions depending on the name
+# of the input files and/or the command-line options used.  See:
+# <http://lists.gnu.org/archive/html/automake/2011-12/msg00039.html>
+# FIXME: in the long run, the better fix will be to convert our testsuite
+# to use `configure.ac' instead of `configure.in' as autoconf input.
+AUTOCONF="$AUTOCONF -B /no/such/dir"
+AUTOM4TE="$AUTOM4TE -B /no/such/dir"
+AUTORECONF="$AUTORECONF -B /no/such/dir"
+
 # Use -Werror because this also turns some Perl warnings into error.
 # (Tests for which this is inappropriate should use -Wno-error.)
 test -z "$ACLOCAL" && ACLOCAL="aclocal-$APIVERSION -Werror"
diff --git a/tests/remake-am-pr10111.test b/tests/remake-am-pr10111.test
old mode 100644
new mode 100755
index 6f622f8..888c9dd
--- a/tests/remake-am-pr10111.test
+++ b/tests/remake-am-pr10111.test
@@ -35,9 +35,9 @@ END
 cat > Makefile.am <<'END'
 include $(srcdir)/foobar.am
 $(srcdir)/foobar.am:
-## Creative quoting to avoid spurious matches in the grepping
+## Creative quoting is to avoid spurious matches in the grepping
 ## of Makefile.in, later.
-       echo '#' 'foobar' 'was 'here' '#' > $@
+       echo "mu =" foobar "was here =" > $@
 END
 
 $ACLOCAL
@@ -58,7 +58,7 @@ cd build
 # included by configure.in works also in VPATH builds.
 rm -f ../foobar.am
 $MAKE
-grep '# foobar was here #' ../Makefile.in
+grep '= foobar was here =' ../Makefile.in
 $MAKE distcheck
 
 :
diff --git a/tests/remake-m4-pr10111.test b/tests/remake-m4-pr10111.test
old mode 100644
new mode 100755


hooks/post-receive
-- 
GNU Automake