From d92fc1e5587aa9d8e374fa7d8508081775338807 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Wed, 17 Nov 2004 22:13:33 +0000 Subject: [PATCH] * tests/defs.in (testaclocaldir): New variable. * tests/aclocal.test: Use it to fix the test. Report from Patrick Welche. --- ChangeLog | 6 ++++++ tests/aclocal.test | 2 +- tests/defs.in | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4504f20d1..f44036831 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-11-17 Alexandre Duret-Lutz + + * 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 * m4/python.m4 (AM_PATH_PYTHON): Fix the invocation of diff --git a/tests/aclocal.test b/tests/aclocal.test index c73c82134..a1e22987e 100755 --- 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 87d9857c4..6f36fbe30 100644 --- 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@' -- 2.47.2