* tests/defs.in (testaclocaldir): New variable.

* tests/aclocal.test: Use it to fix the test.  Report from
Patrick Welche.

diff --git a/ChangeLog b/ChangeLog
index 4504f20d107acb7317fa2f4d0179e55b57144689..f44036831f60245ee3b23158711baeb21556a589 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-17  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * tests/defs.in (testaclocaldir): New variable.
+       * tests/aclocal.test: Use it to fix the test.  Report from
+       Patrick Welche.
+
 2004-11-10  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * m4/python.m4 (AM_PATH_PYTHON): Fix the invocation of

diff --git a/tests/aclocal.test b/tests/aclocal.test
index c73c82134aa750fded97e566670578fd6d82fe4c..a1e22987e6af7fcae050f4069e2afd208cb99e82 100755 (executable)
--- a/tests/aclocal.test
+++ b/tests/aclocal.test
@@ -30,4 +30,4 @@ test -f fred
 $ACLOCAL --unknown-option 2>stderr && exit 1
 grep help stderr
 
-test "`$ACLOCAL --print-ac-dir`" = "$aclocaldir"
+test "`$ACLOCAL --print-ac-dir`" = "$testaclocaldir"

diff --git a/tests/defs.in b/tests/defs.in
index 87d9857c479e19d9d1286d9070cdb47b5bd97a15..6f36fbe30457298f89ebfa73d0419a18348edfc5 100644 (file)
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -300,6 +300,8 @@ case $required in
     ;;
 esac
 
+testaclocaldir='@abs_top_srcdir@/m4'
+
 # POSIX no longer requires 'egrep' and 'fgrep',
 # but some hosts lack 'grep -E' and 'grep -F'.
 EGREP='@EGREP@'