--- autoconf-2.60/tests/m4sugar.at.orig	2006-06-22 19:13:40.000000000 +0100
+++ autoconf-2.60/tests/m4sugar.at	2009-09-07 23:23:59.000000000 +0100
@@ -59,8 +59,7 @@
 
 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 @@
 ]])
 
 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 @@
 # 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 @@
 ]])
 
 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
--- autoconf-2.60/tests/tools.at.orig	2006-06-22 19:13:40.000000000 +0100
+++ autoconf-2.60/tests/tools.at	2009-09-07 23:42:13.000000000 +0100
@@ -101,7 +101,7 @@
 mkdir sub
 mv foo sub
 AT_CHECK_M4SUGAR([], [1], [],
-[m4: script.4s: 1: Cannot open foo: No such file or directory
+[m4: script.4s: 1: cannot open `foo': No such file or directory
 autom4te: m4 failed with exit status: 1
 ])
 
@@ -141,10 +141,6 @@
 TRACE1(foo, active, baz)
 TRACE1(foo, [active], TRACE1(active, [active]))
 
-# With arguments, multiple lines.
-TRACE1(foo
-bar,
-bar
 foo)
 ]])
 
@@ -165,8 +161,6 @@
 configure.ac:13:TRACE2:active
 configure.ac:13:TRACE1:foo:active::ACTIVE
 configure.ac:13:TRACE2:active::ACTIVE
-configure.ac:19:TRACE1:foo bar:bar foo
-configure.ac:19:TRACE2:bar foo
 ]])
 
 # Several line requests.
@@ -186,10 +180,6 @@
 [ACTIVE], [active], [].
 
 [foo], [active], [].
-
-[foo
-bar], [bar
-foo], [].
 ]])
 
 # ${sep}@.
@@ -202,8 +192,19 @@
 [ACTIVE])===([baz]
 [active]
 [active])===([])===([ACTIVE]
-[bar
-foo]
+]])
+
+# Arguments spanning multiple lines.
+AT_DATA([configure.ac],
+[[m4_define([TRACE], [])
+TRACE(foo
+bar,
+bar
+foo)
+]])
+
+AT_CHECK_AUTOCONF([-t TRACE:'$%'], 0,
+[[foo bar:bar foo
 ]])
 
 AT_CLEANUP