2006-10-24  Stepan Kasal  <address@hidden>

	* tools/trace.at (autoconf --trace: user macros): Make the
	test independent on what line number m4 reports for macro
	calls spanning multiple lines.  Reported by Ralf Wildenhues.

Index: tests/tools.at
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/tools.at,v
retrieving revision 1.92
diff -u -r1.92 tools.at
--- tests/tools.at	11 Sep 2006 16:42:57 -0000	1.92
+++ tests/tools.at	24 Oct 2006 19:24:59 -0000
@@ -139,12 +139,6 @@
 TRACE1(foo, TRACE1(bar, baz))
 TRACE1(foo, active, baz)
 TRACE1(foo, [active], TRACE1(active, [active]))
-
-# With arguments, multiple lines.
-TRACE1(foo
-bar,
-bar
-foo)
 ]])
 
 # Several --traces.
@@ -164,8 +158,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.
@@ -185,10 +177,6 @@
 [ACTIVE], [active], [].
 
 [foo], [active], [].
-
-[foo
-bar], [bar
-foo], [].
 ]])
 
 # address@hidden
@@ -201,8 +189,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