automake-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11


From: Stefano Lattarini
Subject: [Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1b-20-g382211b
Date: Thu, 22 Dec 2011 10:39:31 +0000

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=382211b107a2e87b93b928b21f4072f9ddbab4f8

The branch, branch-1.11 has been updated
       via  382211b107a2e87b93b928b21f4072f9ddbab4f8 (commit)
       via  db622310d06f83e21c00d217fdf4b94e62477067 (commit)
       via  7f713c38e4e1ad3c3cca73e6cd23d605ad7b886e (commit)
       via  63da4921d542b2c329cf95f58c955b9972c5d161 (commit)
       via  fb49574d11f61b23b2a25a81e032df7cc5c9b296 (commit)
       via  d2b76f88a2214b15344a00b4100e5f3b87d97198 (commit)
       via  30bd6d1e53fbc31ef3431893e4db3efe9ad799ee (commit)
       via  acd3ff403ae131a7882fb8a38402f519463291c1 (commit)
       via  ccbb437e8102c4cf3779aaef9dc3e06364c4aa02 (commit)
       via  e94a2808b5b885b3c780fadeabceef5a302d8077 (commit)
       via  9c78ef3d74b138432801f72f5f8f50c7433d03b5 (commit)
      from  81ef91cff6070cb603ed173990795e6f61e83477 (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 382211b107a2e87b93b928b21f4072f9ddbab4f8
Author: Stefano Lattarini <address@hidden>
Date:   Wed Dec 21 20:50:57 2011 +0100

    Stable release 1.11.2
    
    * configure.ac: Bump copyright years.
    (AC_INIT): Bump version number to 1.11.2.
    * NEWS: Likewise.
    * doc/automake.texi (Release Statistics): Update, as suggested
    by "make release-stats".

commit db622310d06f83e21c00d217fdf4b94e62477067
Merge: 81ef91c 7f713c3
Author: Stefano Lattarini <address@hidden>
Date:   Wed Dec 21 20:35:35 2011 +0100

    Merge branch 'maint' into branch-1.11
    
    * maint:
      tests: fix spurious failure on systems lacking unistd.h
      test defs: hack to support autoconf-wrapper programs
      tests: fix a minor spurious failure with FreeBSD make
      tests: make two test scripts executable
      readme: reference webpages for automake mailing lists
      readme: update advice about testsuite execution
      readme: don't reference the old homepage at sources.redhat.com
      hacking: some more fixlets
      * NEWS: Fix typo in 'make dist-bzip2' description.

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

Summary of changes:
 ChangeLog                      |   89 ++++++++++++++++++++++++++++++++++++++++
 HACKING                        |    5 +-
 Makefile.in                    |    2 +-
 NEWS                           |    6 +-
 README                         |   30 ++++++++-----
 aclocal.m4                     |    2 +-
 configure                      |   20 ++++----
 configure.ac                   |    5 +-
 doc/Makefile.in                |    2 +-
 doc/automake.texi              |    2 +-
 lib/Automake/Makefile.in       |    2 +-
 lib/Automake/tests/Makefile.in |    2 +-
 lib/Makefile.in                |    2 +-
 lib/am/Makefile.in             |    2 +-
 m4/Makefile.in                 |    2 +-
 m4/amversion.m4                |    4 +-
 tests/Makefile.in              |    2 +-
 tests/README                   |    4 --
 tests/defs.in                  |   11 +++++
 tests/remake-am-pr10111.test   |    6 +-
 tests/silent-lex-generic.test  |    4 ++
 21 files changed, 157 insertions(+), 47 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 c274425..98c8669 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,92 @@
+2011-12-21  Stefano Lattarini  <address@hidden>
+
+       Stable release 1.11.2
+       * configure.ac: Bump copyright years.
+       (AC_INIT): Bump version number to 1.11.2.
+       * NEWS: Likewise.
+       * doc/automake.texi (Release Statistics): Update, as suggested
+       by "make release-stats".
+
+2011-12-20  Peter Rosin  <address@hidden>
+
+       tests: fix spurious failure on systems lacking unistd.h
+       This is for automake bug#10324.
+       * tests/silent-lex-generic.test (foo.l): Add a dummy #define of
+       YY_NO_UNISTD_H, so that the generated foo.c file won't require
+       unistd.h to be present (it is not present when compiling with,
+       e.g., MSVC 9).
+
+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
+       * README: Rationalize and reorganize the (brief) description of
+       the automake mailing lists.   In particular, instead of suggesting
+       the reader to write to the `-request' addresses to subscribe to
+       mailing lists, point him to the relevant webpages, where he can
+       also subscribe via a web form.
+
+2011-12-14  Stefano Lattarini  <address@hidden>
+
+       readme: update advice about testsuite execution
+       * README: Now that the automake testsuite uses the parallel-tests
+       driver, there is no need for the user to capture the stdout of
+       "make check" to determine which tests have failed: a detailed log
+       is automatically saved into the `tests/test-suite.log' file.
+       Since we are at it, improve the wording by dropping an extra
+       "please".
+
+2011-12-14  Stefano Lattarini  <address@hidden>
+
+       readme: don't reference the old homepage at sources.redhat.com
+       * README: Don't reference the old homepage at sources.redhat.com,
+       which is no longer active; reference the homepage on www.gnu.org
+       instead.  See also automake bug#10157 and bug#10248.
+       * tests/README: Likewise, and remove related extra-pedantic advice
+       about copyright papers for test cases (we'll ask for those papers
+       explicitly when we think they are warranted).
+
+2011-12-12  Stefano Lattarini  <address@hidden>
+
+       hacking: some more fixlets
+       * HACKING (Release Procedure): Place the list of pre-release
+       bootstrap-and-test commands on a line of its own, so it's easy to
+       select and then paste it into a terminal window.
+       Fix the explanation of "make git-release", as, since the previous
+       change, "make git-release" would simply run "make dist" rather
+       than "make distcheck".
+       Suggestion from Jim Meyering.
+
+2011-12-12  Peter Rosin  <address@hidden>
+
+       * NEWS: Fix typo in 'make dist-bzip2' description.
+
 2011-12-10  Stefano Lattarini  <address@hidden>
 
        release: don't run "make distcheck" automatically
diff --git a/HACKING b/HACKING
index 1208e32..0fbcbe6 100644
--- a/HACKING
+++ b/HACKING
@@ -206,13 +206,14 @@
 
 * Update ChangeLog.
 
-* Run "./bootstrap && ./configure && make && make check && make distcheck".
+* Run this:
+  ./bootstrap && ./configure && make && make check && make distcheck
 
 * Run `make release-stats' if release statistics in doc/automake.texi
   have not been updated yet.
 
 * Run `make git-release'.
-  This will run distcheck to create the tarballs, commit the last
+  This will run "make dist" to create the tarballs, commit the last
   NEWS/configure.ac/ChangeLog changes, tag the repository, sign
   the tarballs, and upload them.
   Use `make GNUPLOADFLAGS="--user key" git-release' to sign with
diff --git a/Makefile.in b/Makefile.in
index aa7c9bf..e43457c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1c from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/NEWS b/NEWS
index 290578e..9d935b8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.11.1c:
+New in 1.11.2:
 
 * WARNING: Future backward-incompatibilities!
 
@@ -34,7 +34,7 @@ New in 1.11.1c:
   - You may adjust the compression options used in dist-xz and dist-bzip2.
     The default is now merely -e for xz, but still -9 for bzip;  you may
     specify a different level via the XZ_OPT and BZIP2 envvars respectively.
-    E.g., "make dist-xz XZ_OPT=-7" or "make dist-xz BZIP2=-5"
+    E.g., "make dist-xz XZ_OPT=-7" or "make dist-bzip2 BZIP2=-5"
 
   - The `compile' script now converts some options for MSVC for a better
     user experience.  Similarly, the new `ar-lib' script wraps Microsoft lib.
@@ -65,7 +65,7 @@ New in 1.11.1c:
     the `${infodir}/dir' file, by exporting the new environment variable
     `AM_UPDATE_INFO_DIR' to the value "no".
 
-Bugs fixed in 1.11.1c:
+Bugs fixed in 1.11.2:
 
 * Bugs introduced by 1.11:
 
diff --git a/README b/README
index eb49e71..3f2414f 100644
--- a/README
+++ b/README
@@ -23,23 +23,31 @@ Automake has a test suite.  Use
 
        make check
 
-to run it.  Capture its output in case of failing tests.  For more
-information, please see the file tests/README.
+to run it.  For more information, see the file tests/README.
 
 Automake has a page on the web.  See:
 
-       http://sources.redhat.com/automake/
+       http://www.gnu.org/software/automake/
 
-The mailing list address@hidden is for discussion of Automake and
-its interactions with other configuration/portability tools like
-Autoconf or Libtool.  Write to address@hidden if you want to
-join.
+Automake also has three mailing lists:
 
-Mail suggestions and bug reports to address@hidden, patches
-to address@hidden
+  * address@hidden
+    For general discussions of Automake and its interactions with other
+    configuration/portability tools like Autoconf or Libtool.
 
-New releases are announced to address@hidden  Write to
address@hidden if you want to receive them.
+  * address@hidden
+    Where to send bug reports and feature requests.
+
+  * address@hidden
+    Where to send patches, and discuss the automake development process
+    and the  design of new features.
+
+To obtain more information about these list, or to subscribe to them,
+refer to <http://www.gnu.org/software/automake/#mailinglists>
+
+New releases are announced to address@hidden  If you want to
+be informed, subscribe to that list by following the instructions at
+<http://lists.gnu.org/mailman/listinfo/autotools-announce>.
 
 -----
 
diff --git a/aclocal.m4 b/aclocal.m4
index 609122c..b84a1ed 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.1c -*- Autoconf -*-
+# generated automatically by aclocal 1.11.2 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
diff --git a/configure b/configure
index fe20660..fa98982 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for GNU Automake 1.11.1c.
+# Generated by GNU Autoconf 2.68 for GNU Automake 1.11.2.
 #
 # Report bugs to <address@hidden>.
 #
@@ -560,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GNU Automake'
 PACKAGE_TARNAME='automake'
-PACKAGE_VERSION='1.11.1c'
-PACKAGE_STRING='GNU Automake 1.11.1c'
+PACKAGE_VERSION='1.11.2'
+PACKAGE_STRING='GNU Automake 1.11.2'
 PACKAGE_BUGREPORT='address@hidden'
 PACKAGE_URL='http://www.gnu.org/software/automake/'
 
@@ -1199,7 +1199,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU Automake 1.11.1c to adapt to many kinds of systems.
+\`configure' configures GNU Automake 1.11.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1268,7 +1268,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Automake 1.11.1c:";;
+     short | recursive ) echo "Configuration of GNU Automake 1.11.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1337,7 +1337,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU Automake configure 1.11.1c
+GNU Automake configure 1.11.2
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1354,7 +1354,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU Automake $as_me 1.11.1c, which was
+It was created by GNU Automake $as_me 1.11.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2228,7 +2228,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='automake'
- VERSION='1.11.1c'
+ VERSION='1.11.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3324,7 +3324,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNU Automake $as_me 1.11.1c, which was
+This file was extended by GNU Automake $as_me 1.11.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3379,7 +3379,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GNU Automake config.status 1.11.1c
+GNU Automake config.status 1.11.2
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index af513ac..5e8463c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,8 @@
 # Process this file with autoconf to produce a configure script.
 
 # Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([GNU Automake], [1.11.1c], address@hidden)
+AC_INIT([GNU Automake], [1.11.2], address@hidden)
 
 m4_ifndef([AC_PACKAGE_URL],
          [AC_SUBST([PACKAGE_URL], [http://www.gnu.org/software/automake/])])
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 3d42524..e8d959d 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1c from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/doc/automake.texi b/doc/automake.texi
index a076613..c2d7edc 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -13439,7 +13439,7 @@ parentheses is the number of generated test cases.
 @item 2009-05-17 @tab 1.11   @tab 8721 @tab 1092 @tab 8289 @tab 4164 (42) @tab 
1714 (37) @tab 181 @tab 732 (20)
 @item 2009-12-07 @tab 1.10.3 @tab 7892 @tab 1089 @tab 8027 @tab 3566 (40) @tab 
1535 (34) @tab 174 @tab 636
 @item 2009-12-07 @tab 1.11.1 @tab 8722 @tab 1092 @tab 8292 @tab 4162 (42) @tab 
1730 (37) @tab 181 @tab 739 (20)
address@hidden 2011-12-10 @tab 1.11.1b @tab 8822 @tab 1112 @tab 8330 @tab 4223 
(42) @tab 1821 (38) @tab 189 @tab 893 (0)
address@hidden 2011-12-21 @tab 1.11.2 @tab 8822 @tab 1112 @tab 8330 @tab 4223 
(42) @tab 1821 (38) @tab 189 @tab 915 (22)
 @end multitable
 
 
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index a0dfcb8..20e1eb1 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1c from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 802d064..a4fb1ae 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1c from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 4c652d0..b507c04 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1c from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 5152c57..8d7bb40 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1c from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 510f0d7..a2947b0 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1c from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index b7846c1..488aff6 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -18,7 +18,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'
 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.11.1c], [],
+m4_if([$1], [1.11.2], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -34,7 +34,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.11.1c])dnl
+[AM_AUTOMAKE_VERSION([1.11.2])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/tests/Makefile.in b/tests/Makefile.in
index 8a0bc99..718042e 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.1c from Makefile.am.
+# Makefile.in generated by automake 1.11.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/tests/README b/tests/README
index ca17c4f..561f426 100644
--- a/tests/README
+++ b/tests/README
@@ -195,7 +195,3 @@ Do not
   sub-make may not pass `prefix=/opt' along).  Use the following
   instead:
     prefix=/opt $MAKE -e install
-
-  Do not send a test case without signing a copyright disclaimer.
-  See http://sources.redhat.com/automake/contribute.html or
-  ask <address@hidden> for details.
diff --git a/tests/defs.in b/tests/defs.in
index 64bc636..e868592 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
diff --git a/tests/silent-lex-generic.test b/tests/silent-lex-generic.test
index 2b2183e..f1b1ce2 100755
--- a/tests/silent-lex-generic.test
+++ b/tests/silent-lex-generic.test
@@ -53,6 +53,10 @@ LDADD = $(LEXLIB)
 EOF
 
 cat > foo.l <<'EOF'
+%{
+/* avoid non-ANSI #include of unistd.h */
+#define YY_NO_UNISTD_H 1
+%}
 %%
 "END"   return EOF;
 .


hooks/post-receive
-- 
GNU Automake



reply via email to

[Prev in Thread] Current Thread [Next in Thread]