From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 16 Dec 2011 10:12:31 +0000 (+0100)
Subject: test defs: hack to support autoconf-wrapper programs
X-Git-Tag: ng-0.5a~93^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63da4921d542b2c329cf95f58c955b9972c5d161;p=thirdparty%2Fautomake.git

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 6bc7daa3a..9f9b3cc46 100644
--- 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 f24d2ad4c..b19b12128 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"