The test suite needs GNU m4.

Reported by Bob Friesenhahn.

* tests/atconfig.in (M4): Set it.
* tests/base.m4: Use it.

diff --git a/ChangeLog b/ChangeLog
index c7eb7a6223c46a6444b21b96606474f2ac58b5e7..b57115bafabd1635c60598fa063d457b09e3a7e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-05-25  Akim Demaille  <akim@epita.fr>
+
+       The test suite needs GNU m4.
+       Reported by Bob Friesenhahn.
+
+       * tests/atconfig.in (M4): Set it.
+       * tests/base.m4: Use it.
+
 2000-05-25  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (_AC_INIT_PARSE_ARGS): Don't use negated character

diff --git a/tests/atconfig.in b/tests/atconfig.in
index 0438c5c5c35b1abcdb9e19b3d8e30fedff806b1c..0c6c4beb9f4bdd269b479acc51d4a6da42772bea 100644 (file)
--- a/tests/atconfig.in
+++ b/tests/atconfig.in
@@ -76,4 +76,7 @@ if test -n "@AT_TESTPATH@"; then
 else
   export PATH; PATH=`pwd`:$PATH
 fi
+
+# We need GNU m4.
+M4=@M4@
 # Snippet )2

diff --git a/tests/base.m4 b/tests/base.m4
index c4a681190244db0c146011e07e9cd0ba1c9124e8..bd2feb56da6f376e211b787c66adc230cfe87d06 100644 (file)
--- a/tests/base.m4
+++ b/tests/base.m4
@@ -6,14 +6,15 @@ Base layer.
 
 EOF
 
-dnl AU_DEFUN
-dnl --------
-dnl
+# AU_DEFUN
+# --------
+
 AT_SETUP(m4_wrap)
 
-dnl m4_wrap is used to display the help strings.
-dnl Also, check that commas are not swallowed.  This can easily happen
-dnl because of m4-listification.
+# m4_wrap is used to display the help strings.  Also, check that
+# commas are not swallowed.  This can easily happen because of
+# m4-listification.
+
 AT_DATA(libm4.in,
 [[include(libm4.m4)divert(0)dnl
 m4_wrap([Short string */], [   ], [/* ], 20)
@@ -47,7 +48,7 @@ AT_DATA(expout,
 First, second , third, [,quoted]
 ]])
 
-AT_CHECK([m4 -I $at_top_srcdir libm4.in], 0, expout)
+AT_CHECK([$M4 -I $at_top_srcdir libm4.in], 0, expout)
 
 
 AT_CLEANUP()