From 3afe65327193ddf38a8d29b5698320a45b86601d Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 9 Apr 2001 09:08:45 +0000 Subject: [PATCH] (&variable_conditions): Don't include `FALSE' in the result. --- ChangeLog | 9 +++++++++ automake.in | 14 +++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b35a0d43..bdc981b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-04-09 Akim Demaille + + (&variable_conditions): Don't include `FALSE' in the result. + +2001-04-09 Akim Demaille + + * automake.in (&variable_conditions_reduce): FALSE is absorbent. + (&variable_conditions): Don't include `FALSE' in the result. + 2001-04-09 Akim Demaille * tests/defs, tests/depend3.test: Remove useless code. diff --git a/automake.in b/automake.in index b1956c22..a63bbc09 100755 --- a/automake.in +++ b/automake.in @@ -5755,6 +5755,8 @@ sub variable_conditions ($) %vars_scanned = (); foreach my $cond (&variable_conditions_sub ($var, '', ())) { + next + if $cond eq 'FALSE'; $uniqify{$cond} = 1; } @@ -5918,9 +5920,15 @@ sub variable_conditions_reduce my @ret = (); foreach my $cond (@conds) { - next - if ! conditionals_true_when (($cond), (@ret)); - push (@ret, $cond); + # FALSE is absorbent. + if ($cond eq 'FALSE') + { + return ('FALSE'); + } + elsif (conditionals_true_when (($cond), (@ret))) + { + push (@ret, $cond); + } } return @ret; -- 2.43.5