37-fix-conditions-reduce.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <[EMAIL PROTECTED]>

        * automake.in (&variable_conditions_reduce): FALSE is absorbent.
        (&variable_conditions): Don't include `FALSE' in the result.

Index: ChangeLog
from  Akim Demaille  <[EMAIL PROTECTED]>
        (&variable_conditions): Don't include `FALSE' in the result.
Index: automake.in
--- automake.in Sun, 11 Mar 2001 10:15:17 +0100 akim (am/f/39_automake.i 1.157 755)
+++ automake.in Sun, 11 Mar 2001 10:37:06 +0100 akim (am/f/39_automake.i 1.157 755)
@@ -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 +5918,15 @@
     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;