* automake.in (scan_autoconf_traces): Use an unlikely to be used

separator between trace arguments, in particular not `:' as it is
within AC_CONFIG_FILES's $1.

diff --git a/ChangeLog b/ChangeLog
index 011b950b2dbe7f34a6bb414951d424830f141485..25a8a17bbcbe9e55f18df5aca02fda1898778661 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-20  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (scan_autoconf_traces): Use an unlikely to be used
+       separator between trace arguments, in particular not `:' as it is
+       within AC_CONFIG_FILES's $1.
+
+       
 2001-10-20  Akim Demaille  <akim@epita.fr>
 
        * tests/alpha.test (configure.in): Create, don't append.  A single

diff --git a/automake.in b/automake.in
index e21e86ee9dd8a9ec86ded5832098cbf86d395836..e16735d34f679a34a609c56f96ba5bb5e78d7fb1 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4444,13 +4444,15 @@ sub scan_autoconf_traces ($)
 {
   my ($filename) = @_;
 
+  my @traced = ('AC_CONFIG_FILES', 'AC_LIBSOURCE', 'AC_SUBST',
+               'AM_CONDITIONAL', 'AM_INIT_AUTOMAKE');
+
   my $traces = "$ENV{amtraces} ";
 
-  $traces .= ' --trace=AC_CONFIG_FILES';
-  $traces .= ' --trace=AC_LIBSOURCE';
-  $traces .= ' --trace=AC_SUBST';
-  $traces .= ' --trace=AM_CONDITIONAL';
-  $traces .= ' --trace=AM_INIT_AUTOMAKE';
+  # Use a separator unlikely to be used, not `:', the default, which
+  # has a precise meaning for AC_CONFIG_FILES and so on.
+  $traces .= join (' ',
+                  map { "--trace=$_" . ':\$f::\$l::\$n::\${::}%' } @traced);
 
   my $tracefh = new Automake::XFile ("$traces |");
   verbose "reading $traces";
@@ -4458,7 +4460,7 @@ sub scan_autoconf_traces ($)
   while ($_ = $tracefh->getline)
     {
       chomp;
-      my ($file, $line, @args) = split /:/;
+      my ($file, $line, @args) = split /::/;
       my $macro = $args[0];
       my $here = "$file:$line";