On Friday 03 September 2010, Stefano Lattarini wrote:
> * 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(-)
Moved as last patch in the updated patch series, and tweaked
accordingly.
Regards,
Stefano
From adba8e96113e4883ec568babd14709538fc696c6 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 4/4] Tests defs: remove variable $testaclocaldir.
* tests/defs.in ($testaclocaldir): Removed.
* tests/aclocal.test: Use `$top_testsrcdir/m4' directly, no
t `$testaclocaldir'.
---
ChangeLog | 5 +++++
tests/aclocal.test | 2 +-
tests/defs.in | 2 --
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2b41e2b..42e97f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2010-09-06 Stefano Lattarini <stefano.lattar...@gmail.com>
+ Tests defs: remove variable $testaclocaldir.
+ * tests/defs.in ($testaclocaldir): Removed.
+ * tests/aclocal.test: Use `$top_testsrcdir/m4' directly, not
+ `$testaclocaldir'.
+
Tests defs: $srcdir and $top_srcdir renaming.
* tests/defs.in ($srcdir): Remove, define $testsrcdir directly.
* tests/Makefile.am ($(parallel_tests)): Generation of derived
diff --git a/tests/aclocal.test b/tests/aclocal.test
index da80d08..3e78df9 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_testsrcdir/m4"
:
diff --git a/tests/defs.in b/tests/defs.in
index 7f6807c..f73edd4 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -371,8 +371,6 @@ case " $required " in
;;
esac
-testaclocaldir=$top_testsrcdir/m4
-
# POSIX no longer requires 'egrep' and 'fgrep',
# but some hosts lack 'grep -E' and 'grep -F'.
EGREP='@EGREP@'
--
1.7.1
