* tests/m4sugar.at (m4_warn, m4_require: circular dependencies):

Also work with M4 1.4.8.

diff --git a/ChangeLog b/ChangeLog
index 10c6623f0528b010958ee71b91eabeaaa48be26d..7427f11f909b5efd8206c16bb69f6f95bd02e0ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-26  Eric Blake  <ebb9@byu.net>
+
+       * tests/m4sugar.at (m4_warn, m4_require: circular dependencies):
+       Also work with M4 1.4.8.
+
 2006-10-25  Paul Eggert  <eggert@cs.ucla.edu>
 
        * doc/autoconf.texi (Slashes): Document Tru64 4.0 bug reported by

diff --git a/tests/m4sugar.at b/tests/m4sugar.at
index 486f805ad166bbb7f36dc2d288cbf30c464069df..8747ed544b9fd358b6aefd2235fff2e0bb924019 100644 (file)
--- a/tests/m4sugar.at
+++ b/tests/m4sugar.at
@@ -59,8 +59,7 @@ AT_SETUP([m4@&t@_warn])
 
 AT_DATA_M4SUGAR([script.4s],
 [[m4_init
-m4_defun([cross_warning],
-[m4_warn([cross],  [cross])])
+m4_defun([cross_warning], [m4_warn([cross],  [cross])])
 
 m4_divert([0])dnl
 m4_warn([obsolete],  [obsolete])dnl
@@ -69,27 +68,27 @@ m4_warn([syntax], [syntax])dnl
 ]])
 
 AT_CHECK_M4SUGAR([-o-], 0, [],
-[script.4s:8: warning: syntax
+[script.4s:7: warning: syntax
 ])
 
 AT_CHECK_M4SUGAR([-o- -Wall -f], 0, [],
-[script.4s:6: warning: obsolete
-script.4s:7: warning: cross
-script.4s:3: cross_warning is expanded from...
-script.4s:7: the top level
-script.4s:8: warning: syntax
+[script.4s:5: warning: obsolete
+script.4s:6: warning: cross
+script.4s:2: cross_warning is expanded from...
+script.4s:6: the top level
+script.4s:7: warning: syntax
 ])
 
 AT_CHECK_M4SUGAR([-o- -Wnone,cross -f], 0, [],
-[script.4s:7: warning: cross
-script.4s:3: cross_warning is expanded from...
-script.4s:7: the top level
+[script.4s:6: warning: cross
+script.4s:2: cross_warning is expanded from...
+script.4s:6: the top level
 ])
 
 AT_CHECK_M4SUGAR([-o- -Wnone,cross,error -f], 1, [],
-[[script.4s:7: warning: cross
-script.4s:3: cross_warning is expanded from...
-script.4s:7: the top level
+[[script.4s:6: warning: cross
+script.4s:2: cross_warning is expanded from...
+script.4s:6: the top level
 ]])
 
 AT_CLEANUP
@@ -125,14 +124,11 @@ AT_SETUP([m4@&t@_require: circular dependencies])
 # m4-listification.
 
 AT_DATA_M4SUGAR([script.4s],
-[[m4_defun([foo],
-[m4_require([bar])])
+[[m4_defun([foo], [m4_require([bar])])
 
-m4_defun([bar],
-[m4_require([foo])])
+m4_defun([bar], [m4_require([foo])])
 
-m4_defun([baz],
-[m4_require([foo])])
+m4_defun([baz], [m4_require([foo])])
 
 m4_init
 m4_divert([0])dnl
@@ -140,11 +136,11 @@ baz
 ]])
 
 AT_CHECK_M4SUGAR([], 1, [],
-[[script.4s:12: error: m4@&t@_require: circular dependency of foo
-script.4s:5: bar is expanded from...
-script.4s:2: foo is expanded from...
-script.4s:8: baz is expanded from...
-script.4s:12: the top level
+[[script.4s:9: error: m4@&t@_require: circular dependency of foo
+script.4s:3: bar is expanded from...
+script.4s:1: foo is expanded from...
+script.4s:5: baz is expanded from...
+script.4s:9: the top level
 autom4te: m4 failed with exit status: 1
 ]])
 AT_CLEANUP