* autoconf.sh (trace_m4::smash): Double quote, we don't want the

result to be evaluated.

diff --git a/ChangeLog b/ChangeLog
index 22085d82f63f4c7ed707959829602b9aa2ed97d0..462d165885b0cb540332fa3afd291361583da625 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-14  Akim Demaille  <akim@epita.fr>
+
+       * autoconf.sh (trace_m4::smash): Double quote, we don't want the
+       result to be evaluated.
+
 2000-03-14  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4: s/@%:@line __oline__/#line __oline__/g. __oline__

diff --git a/autoconf.in b/autoconf.in
index e0bbe5b075072acb01bf205cec50100552da1c7f..0f0a5cd5eb3bdf0b540f01c69eddf755940b92d1 100644 (file)
--- a/autoconf.in
+++ b/autoconf.in
@@ -293,15 +293,16 @@ divert(-1)
          [ifelse([$#], [1], [],
                  [$#], [2], [smash([$2])],
                  [smash([$2])[$1]_star([$1], shift(shift($@)))])])
+
+  # Smash quotes its result.
   define([smash],
-         [patsubst(patsubst(patsubst(patsubst([[[[$1]]]],
+         [patsubst(patsubst(patsubst([[[$1]]],
                                      [\\
 ]),
-                            [[
-       ]+],
-                            [ ]),
-                          [^\(..\) ], [\1]),
-                [ \(.\)$], [\1])])
+                           [[
+     ]+],
+                           [ ]),
+                  [^ *\(.*\) *$], [[\1]])])
   define([args],
          [shift(shift(shift(shift(shift($@)))))])
   define([at],

diff --git a/autoconf.sh b/autoconf.sh
index e0bbe5b075072acb01bf205cec50100552da1c7f..0f0a5cd5eb3bdf0b540f01c69eddf755940b92d1 100644 (file)
--- a/autoconf.sh
+++ b/autoconf.sh
@@ -293,15 +293,16 @@ divert(-1)
          [ifelse([$#], [1], [],
                  [$#], [2], [smash([$2])],
                  [smash([$2])[$1]_star([$1], shift(shift($@)))])])
+
+  # Smash quotes its result.
   define([smash],
-         [patsubst(patsubst(patsubst(patsubst([[[[$1]]]],
+         [patsubst(patsubst(patsubst([[[$1]]],
                                      [\\
 ]),
-                            [[
-       ]+],
-                            [ ]),
-                          [^\(..\) ], [\1]),
-                [ \(.\)$], [\1])])
+                           [[
+     ]+],
+                           [ ]),
+                  [^ *\(.*\) *$], [[\1]])])
   define([args],
          [shift(shift(shift(shift(shift($@)))))])
   define([at],

diff --git a/bin/autoconf.in b/bin/autoconf.in
index e0bbe5b075072acb01bf205cec50100552da1c7f..0f0a5cd5eb3bdf0b540f01c69eddf755940b92d1 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -293,15 +293,16 @@ divert(-1)
          [ifelse([$#], [1], [],
                  [$#], [2], [smash([$2])],
                  [smash([$2])[$1]_star([$1], shift(shift($@)))])])
+
+  # Smash quotes its result.
   define([smash],
-         [patsubst(patsubst(patsubst(patsubst([[[[$1]]]],
+         [patsubst(patsubst(patsubst([[[$1]]],
                                      [\\
 ]),
-                            [[
-       ]+],
-                            [ ]),
-                          [^\(..\) ], [\1]),
-                [ \(.\)$], [\1])])
+                           [[
+     ]+],
+                           [ ]),
+                  [^ *\(.*\) *$], [[\1]])])
   define([args],
          [shift(shift(shift(shift(shift($@)))))])
   define([at],