* automake.in (conditional_implies_one_of): Rename as ...

(conditional_implies_any): ... this.
* tests/pluseq9.test: Exercise another case with the new
`C' variable.
Suggested by Raja R Harinath.

diff --git a/ChangeLog b/ChangeLog
index 780a951..c8dbd75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-05-20  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * automake.in (conditional_implies_one_of): Rename as ...
+       (conditional_implies_any): ... this.
+       * tests/pluseq9.test: Exercise another case with the new
+       `C' variable.
+       Suggested by Raja R Harinath.
+
 2002-05-17  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * tests/defs (configure.in): Quote macro arguments.

diff --git a/automake.in b/automake.in
index f6cb007..8695d9d 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5391,10 +5391,10 @@ sub conditional_is_redundant ($@)
 
 
 # $BOOLEAN
-# &conditional_implies_one_of ($COND, @CONDS)
-# -------------------------------------------
-# Returns true iff $COND implies one of the conditions in @CONDS.
-sub conditional_implies_one_of ($@)
+# &conditional_implies_any ($COND, @CONDS)
+# ----------------------------------------
+# Returns true iff $COND implies any of the conditions in @CONDS.
+sub conditional_implies_any ($@)
 {
     my ($cond, @conds) = @_;
 
@@ -6271,7 +6271,7 @@ sub invert_conditions
     foreach my $perm (@perm)
     {
        push @notconds, $perm
-           if ! conditional_implies_one_of ($perm, @conds);
+           if ! conditional_implies_any ($perm, @conds);
     }
     return @notconds;
 }

diff --git a/tests/pluseq9.test b/tests/pluseq9.test
index 2aed68f..01ad9b8 100755 (executable)
--- a/tests/pluseq9.test
+++ b/tests/pluseq9.test
@@ -12,9 +12,11 @@ EOF
 
 cat > Makefile.am << 'END'
 if COND1
+  C = c
 if COND2
     A = a
     B = aa
+    C += cc
 else
     A = b
     B = bb