Improve compatibility when the versions of Autoconf and Autotest don't match.

diff --git a/ChangeLog b/ChangeLog
index b7844ccf72bc18625831f4ce4fba92425aa2bbb5..a7d88b1886779cad523fdcd99c44488e9c7bd99b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-05  Stepan Kasal  <kasal@ucw.cz>
+
+       * lib/autoconf/autotest.m4 (AC_CONFIG_TESTDIR): Set also
+       at_top_builddir, for compatibility with older autotest.
+       * lib/autotest/general.m4 (AT_INIT): If at_top_build_prefix
+       is not set, use at_top_builddir, for compatibility with older
+       versions of autoconf.
+
 2005-07-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        * bin/autom4te.in ($m4): Catch usages like --nesting-limit=2048.

diff --git a/lib/autoconf/autotest.m4 b/lib/autoconf/autotest.m4
index a415ede3384260c038ee8da914ef9bfc23915439..e9990a6ac29e6cd3d36bbe4c4ac579d97f12f106 100644 (file)
--- a/lib/autoconf/autotest.m4
+++ b/lib/autoconf/autotest.m4
@@ -78,6 +78,9 @@ abs_top_srcdir='$ac_abs_top_srcdir'
 at_top_build_prefix='$ac_top_build_prefix'
 abs_top_builddir='$ac_abs_top_builddir'
 
+# Backward compatibility with Autotest <= 2.59b:
+at_top_builddir=\$at_top_build_prefix
+
 AUTOTEST_PATH='m4_default([$2], [$1])'
 
 SHELL=\${CONFIG_SHELL-'$SHELL'}

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 49fd98ca1868eb41a70c0b34f774cc095346d9bb..29d43412132e970a86f89dd68a0f3acd028503b0 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -178,6 +178,9 @@ do
   . ./$at_file || AS_ERROR([invalid content: $at_file])
 done
 
+# Autoconf <=2.59b set at_top_builddir instead of at_top_build_prefix:
+: ${at_top_build_prefix=$at_top_builddir}
+
 # atconfig delivers names relative to the directory the test suite is
 # in, but the groups themselves are run in testsuite-dir/group-dir.
 if test -n "$at_top_srcdir"; then