(&variable_conditions): Don't include `FALSE' in the result.

diff --git a/ChangeLog b/ChangeLog
index b35a0d4369abfcf0f6b2864305bb5f3f0d796945..bdc981b11e5875473c1db1f25a5e7840876f4408 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-04-09  Akim Demaille  <akim@epita.fr>
+
+       (&variable_conditions): Don't include `FALSE' in the result.
+
+2001-04-09  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&variable_conditions_reduce): FALSE is absorbent.
+       (&variable_conditions): Don't include `FALSE' in the result.
+
 2001-04-09  Akim Demaille  <akim@epita.fr>
 
        * tests/defs, tests/depend3.test: Remove useless code.

diff --git a/automake.in b/automake.in
index b1956c22426b3f2ef3665b076967c4eea9dae8d3..a63bbc09f916eabdc79d04d23e00cf1c0a0be197 100755 (executable)
--- 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;