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>

diff --git a/ChangeLog b/ChangeLog
index 6bc7daa3a1571a51bee9a0f13832c7c994ca77f9..9f9b3cc46c54b1ff9db5cf3340854f0800c9e4dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-12-16  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       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  <stefano.lattarini@gmail.com>
 
        tests: fix a minor spurious failure with FreeBSD make

diff --git a/tests/defs.in b/tests/defs.in
index f24d2ad4c83bf1b3dc700766ca3478e6fc6d4d6f..b19b121281091affb532427d83ae1d4e5ad04424 100644 (file)
--- 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"