From fb209c742c984735e113cc3ce07d45419c5d6ebb Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 23 Mar 2001 17:09:59 +0000 Subject: [PATCH] * automake.in (&read_am_file): Keep $cond_string up to date. --- ChangeLog | 5 +++++ automake.in | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 11c30dc1..3be49224 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-03-23 Akim Demaille + + * automake.in (&read_am_file): Keep $cond_string up to date. + + 2001-03-23 Akim Demaille * automake.in (&define_variable): Use ¯o_define. diff --git a/automake.in b/automake.in index 4911d6e7..c1dc0def 100755 --- a/automake.in +++ b/automake.in @@ -6374,6 +6374,7 @@ sub read_am_file # sure it is the same on exit. This lets us conditonally include # other files. my @saved_cond_stack = @conditional_stack; + my $cond_string = conditional_string (@conditional_stack); my $saw_bk = 0; my $was_rule = 0; @@ -6436,6 +6437,7 @@ sub read_am_file if ! $configure_cond{$cond} && $cond !~ /^TRUE|FALSE$/; push (@conditional_stack, ($cond =~ /^TRUE|FALSE$/) ? "$cond" : "${cond}_TRUE"); + $cond_string = conditional_string (@conditional_stack); } elsif (/$ELSE_PATTERN/o) { @@ -6451,6 +6453,7 @@ sub read_am_file { $conditional_stack[$#conditional_stack] =~ s/TRUE$/FALSE/; + $cond_string = conditional_string (@conditional_stack); } } elsif (/$ENDIF_PATTERN/o) @@ -6462,6 +6465,7 @@ sub read_am_file else { pop @conditional_stack; + $cond_string = conditional_string (@conditional_stack); } } elsif (/$RULE_PATTERN/o) @@ -6469,7 +6473,7 @@ sub read_am_file # Found a rule. $was_rule = 1; - rule_define ($1, 0, conditional_string (@conditional_stack), $.); + rule_define ($1, 0, $cond_string, $.); $content_lines{$1} = $.; $output_trailer .= $comment . $spacing; @@ -6498,8 +6502,7 @@ sub read_am_file $value = $3 . "\n"; } - macro_define ($last_var_name, 0, $type, - conditional_string (@conditional_stack), + macro_define ($last_var_name, 0, $type, $cond_string, $value, $.); push (@var_list, $last_var_name); -- 2.43.5