* bin/autom4te.in (handle_traces): Fix rewriting of traces without

diff --git a/ChangeLog b/ChangeLog
index 18ae22535ffd7d16ef774b6da76f226cff1e6b84..ab26fff6ba2505f406907b1249f7eaa7119f1847 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-03  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * bin/autom4te.in (handle_traces): Fix rewriting of traces without
+        arguments.
+
 2001-08-03  Akim Demaille  <akim@epita.fr>
 
        * bin/autoconf.in ($@): Work around the usual sh bug.

diff --git a/bin/autom4te.in b/bin/autom4te.in
index db508dfd6af0b74546a20e1f7e216bdfc2483efd..6322c3fff94ffffae10f8584c33896a88bbd5a38 100644 (file)
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -820,12 +820,14 @@ EOF
     or die "$me: cannot open $me.cache/" . $req->cache . ": $!\n";
   while ($_ = $traces->getline)
     {
-      # Multiline traces.
+      # Trace with arguments, as the example above.  We don't try
+      # to match the trailing parenthesis as it might be on a
+      # separate line.
       s{^m4trace:(.+):(\d+): -(\d+)- ([^(]+)\((.*)$}
        {AT_$4([$1], [$2], [$3], [$4], $5};
-      # Single line traces, as the example above.
-      s{^m4trace:(.+):(\d+): -(\d+)- (.*)$}
-       {AT_$4([$1], [$2], [$3], [$4]};
+      # Traces without arguments, always on a single line.
+      s{^m4trace:(.+):(\d+): -(\d+)- ([^)]*)\n$}
+       {AT_$4([$1], [$2], [$3], [$4])\n};
       print $trace_m4 "$_";
     }
   $trace_m4->close;