(at_flatten): rewritten to avoid M4 problem when

\(.*\) match is too long and there is something more to be checked.
<http://mail.gnu.org/pipermail/autoconf/2002-November/014524.html>

This also undoes the previous patch.

diff --git a/bin/autom4te.in b/bin/autom4te.in
index 4de2907783a71a78493760f8f83c86ca61c9a17c..fbec2e41ef3f69b14b2765734a0ac00f8de87579 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -941,9 +941,10 @@ sub handle_traces ($$%)
   # Note that the second pattern is `newline, tab or space'.  Don't lose
   # the tab!
   define([at_flatten],
-  [at_patsubst(at_patsubst(at_patsubst([[[$1]]], [\\\n]),
-                           [[\n\t ]+], [ ]),
-               [^ *\(.*[^ ]\)? *], [[\1]])])
+  [at_patsubst(at_patsubst(at_patsubst(at_patsubst([[[[$1]]]], [\\\n]),
+                                       [[\n\t ]+], [ ]),
+                           [ *\(.\)$], [\1]),
+              [^ *\(.*\)], [[\1]])])
 
   define([at_args],    [at_shift(at_shift(at_shift(at_shift(at_shift($@)))))])
   define([at_at],      [_$0([$1], at_args($@))])