From 452699cf4f2a693e1870d24b550b307a128d09f0 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sat, 20 Oct 2001 11:17:49 +0000 Subject: [PATCH] * 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. --- ChangeLog | 7 +++++++ automake.in | 14 ++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 011b950b..25a8a17b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-10-20 Akim Demaille + + * 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 * tests/alpha.test (configure.in): Create, don't append. A single diff --git a/automake.in b/automake.in index e21e86ee..e16735d3 100755 --- 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"; -- 2.43.5