From 53810e0ddf03bfd06c76037ddb83ce5838610e4e Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Wed, 3 Nov 2004 21:49:39 +0000
Subject: [PATCH] * tests/defs.in: Do not distinguish VERBOSE=x from
 VERBOSE=anything_but_x, always turn on shell traces.

---
 ChangeLog     | 3 +++
 tests/defs.in | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5438a13..71bac9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-11-03  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* tests/defs.in: Do not distinguish VERBOSE=x from
+	VERBOSE=anything_but_x, always turn on shell traces.
+
 	* aclocal.in (write_aclocal): Make sure $map_traced_defs{$m} exists
 	before using it.  Suppress a warning observable in test/acloca16.test.
 	Report from Ralf Wildenhues.
diff --git a/tests/defs.in b/tests/defs.in
index 8a7dd28..0267f3b 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -44,7 +44,7 @@ test -f ./defs || {
 
 # If srcdir is not set, then we are not running from `make check', be verbose.
 if test -z "$srcdir"; then
-   test -z "$VERBOSE" && VERBOSE=x
+   VERBOSE=x
    # compute $srcdir.
    srcdir=`echo "$0" | sed -e 's,/[^\\/]*$,,'`
    test $srcdir = $0 && srcdir=.
@@ -335,8 +335,8 @@ AUTOMAKE_fails ()
   AUTOMAKE_run 1 ${1+"$@"}
 }
 
-# Turn on shell traces when VERBOSE=x.
-if test "x$VERBOSE" = xx; then
+# Turn on shell traces when VERBOSE is set.
+if test -n "$VERBOSE"; then
   set -x
 else
   :
-- 
2.7.4