28 lines
826 B
Text
28 lines
826 B
Text
Index: bin/automake.in
|
|
--- bin/automake.in.orig
|
|
+++ bin/automake.in
|
|
@@ -3872,7 +3872,7 @@ sub substitute_ac_subst_variables_worker
|
|
sub substitute_ac_subst_variables
|
|
{
|
|
my ($text) = @_;
|
|
- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
|
|
+ $text =~ s/\$[{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
|
|
return $text;
|
|
}
|
|
|
|
@@ -5089,6 +5089,7 @@ sub scan_autoconf_traces
|
|
_LT_AC_TAGCONFIG => 0,
|
|
m4_include => 1,
|
|
m4_sinclude => 1,
|
|
+ include => 1,
|
|
sinclude => 1,
|
|
);
|
|
|
|
@@ -5112,6 +5113,7 @@ sub scan_autoconf_traces
|
|
my ($here, $depth, @args) = split (/::/);
|
|
$where = new Automake::Location $here;
|
|
my $macro = $args[0];
|
|
+ next if ($macro eq "include");
|
|
|
|
prog_error ("unrequested trace '$macro'")
|
|
unless exists $traced{$macro};
|