* tests/defs.in ($testaclocaldir): Removed. * tests/aclocal.test: Use `$top_srcdir/m4', not `$testaclocaldir'. --- ChangeLog | 4 ++++ tests/aclocal.test | 2 +- tests/defs.in | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-)
From c59962b21c880e7f70d222565e1fea489ed20c20 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini <stefano.lattar...@gmail.com> Date: Wed, 9 Jun 2010 15:20:58 +0200 Subject: [PATCH 3/4] Tests defs: remove variable $testaclocaldir.
* tests/defs.in ($testaclocaldir): Removed. * tests/aclocal.test: Use `$top_srcdir/m4', not `$testaclocaldir'. --- ChangeLog | 4 ++++ tests/aclocal.test | 2 +- tests/defs.in | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07b9e2f..1f8c954 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-09-02 Stefano Lattarini <stefano.lattar...@gmail.com> + Tests defs: remove variable $testaclocaldir. + * tests/defs.in ($testaclocaldir): Removed. + * tests/aclocal.test: Use `$top_srcdir/m4', not `$testaclocaldir'. + Tests defs: new variable $top_srcdir. * tests/defs.in ($top_srcdir): Define unconditionally to @abs_top_src...@. Use it throughout. diff --git a/tests/aclocal.test b/tests/aclocal.test index da80d08..7c9eb28 100755 --- a/tests/aclocal.test +++ b/tests/aclocal.test @@ -41,6 +41,6 @@ grep '[Tt]ry.*--help.*for more information' stderr $ACLOCAL --versi -test "`$ACLOCAL --print-ac-dir`" = "$testaclocaldir" +test x"`$ACLOCAL --print-ac-dir`" = x"$top_srcdir/m4" : diff --git a/tests/defs.in b/tests/defs.in index 802655f..45504ab 100644 --- a/tests/defs.in +++ b/tests/defs.in @@ -368,8 +368,6 @@ case " $required " in ;; esac -testaclocaldir=$top_srcdir/m4 - # POSIX no longer requires 'egrep' and 'fgrep', # but some hosts lack 'grep -E' and 'grep -F'. EGREP='@EGREP@' -- 1.7.1