2001-07-31 Richard Boulton <richard@tartarus.org>

            Raja R Harinath <harinath@cs.umn.edu>

	* automake.in (variable_conditions_sub): Remove @parent_conds
	argument.  This was old logic - duplicate or impossible
	conditionals are removed later by &variable_conditions_reduce().
	Fixes tests/cond13.test.
	(conditionals_true_when): Removed.
	* tests/Makefile.am (XFAIL_TESTS): Removed cond13.test.

diff --git a/ChangeLog b/ChangeLog
index e15ebaf8cf72e5d0cf8d362213ef2b2db7f960f1..a0fa08c890aa34224829ede19ba01c85fa1a8b1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-07-31  Richard Boulton <richard@tartarus.org>
+            Raja R Harinath <harinath@cs.umn.edu>
+
+       * automake.in (variable_conditions_sub): Remove @parent_conds
+       argument.  This was old logic - duplicate or impossible
+       conditionals are removed later by &variable_conditions_reduce().
+       Fixes tests/cond13.test.
+       (conditionals_true_when): Removed.
+       * tests/Makefile.am (XFAIL_TESTS): Removed cond13.test.
+
 2001-07-31  Tom Tromey  <tromey@redhat.com>
 
        * tests/Makefile.am (TESTS): Added cond13.test.

diff --git a/automake.in b/automake.in
index c61b9e525b682d98b2fd8f433f6288fdb9e08305..125829bbad7f0f2a5f5393d7c381c87c71a4fb0e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5367,24 +5367,6 @@ sub conditional_true_when ($$)
 }
 
 
-# $BOOLEAN
-# &conditionals_true_when (\@CONDS, $WHEN)
-# ----------------------------------------
-# Same as above, but true only if all the @CONDS are true when $WHEN is true.
-#
-# If there are no @CONDS, then return true.
-sub conditionals_true_when (\@$)
-{
-    my ($condsref, $when) = @_;
-
-    foreach my $cond (@$condsref)
-    {
-       return 0 unless conditional_true_when ($cond, $when);
-    }
-
-    return 1;
-}
-
 # $BOOLEAN
 # &conditional_is_redundant ($COND, @WHENS)
 # ----------------------------------------
@@ -5849,7 +5831,7 @@ sub variable_conditions ($)
 
     %vars_scanned = ();
 
-    my @new_conds = &variable_conditions_sub ($var, '', ());
+    my @new_conds = &variable_conditions_sub ($var, '');
     # Now we want to return all permutations of the subvariable
     # conditions.
     my %allconds = ();
@@ -5894,14 +5876,13 @@ sub variable_conditionally_defined ($)
 
 
 
-# &variable_conditions_sub ($VAR, $PARENT, @PARENT_CONDS)
+# &variable_conditions_sub ($VAR, $PARENT)
 # -------------------------------------------------------
 # A subroutine of variable_conditions.  This returns all the
-# conditions of $VAR which are satisfiable when all of @PARENT_CONDS
-# are true.
+# conditions of $VAR, including those of any sub-variables.
 sub variable_conditions_sub
 {
-    my ($var, $parent, @parent_conds) = @_;
+    my ($var, $parent) = @_;
     my @new_conds = ();
 
     if (defined $vars_scanned{$var})
@@ -5915,16 +5896,10 @@ sub variable_conditions_sub
     # Examine every condition under which $VAR is defined.
     foreach my $vcond (keys %{$var_value{$var}})
     {
-       # If this condition cannot be true when the parent conditions
-       # are true, then skip it.
-       next
-         if ! conditionals_true_when (@parent_conds, $vcond);
-
        push (@this_conds, $vcond);
 
        # If $VAR references some other variable, then compute the
        # conditions for that subvariable.
-       push (@parent_conds, $vcond);
        my @subvar_conds = ();
        foreach (split (' ', $var_value{$var}{$vcond}))
        {
@@ -5938,7 +5913,7 @@ sub variable_conditions_sub
                # Here we compute all the conditions under which the
                # subvariable is defined.  Then we go through and add
                # $VCOND to each.
-               my @svc = &variable_conditions_sub ($1, $var, @parent_conds);
+               my @svc = &variable_conditions_sub ($1, $var);
                foreach my $item (@svc)
                {
                    my $val = conditional_string ($vcond, split (' ', $item));
@@ -5947,7 +5922,6 @@ sub variable_conditions_sub
                }
            }
        }
-       pop (@parent_conds);
 
        # If there are no conditional subvariables, then we want to
        # return this condition.  Otherwise, we want to return the
@@ -5990,9 +5964,6 @@ sub variable_conditions_sub
            }
            next if ! $ok;
 
-           next
-             if ! conditionals_true_when (@parent_conds, $perm);
-
            # This permutation was not already handled, and is valid
            # for the parents.
            push (@new_conds, $perm);

diff --git a/tests/Makefile.am b/tests/Makefile.am
index cae8b9d988f0f476be4d64b987dcd1811f105fba..fc9bfda9ae8a75fef9745845ad54eedbc4f630fe 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 
-XFAIL_TESTS = subdir5.test auxdir2.test cond13.test
+XFAIL_TESTS = subdir5.test auxdir2.test
 
 TESTS =        \
 acinclude.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5e13adee0b4ae1007fee948732dabef1056e5cdd..d600297d9758d5d016315df69edce646e390fa30 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -68,7 +68,7 @@ am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
 
-XFAIL_TESTS = subdir5.test auxdir2.test cond13.test
+XFAIL_TESTS = subdir5.test auxdir2.test
 
 TESTS = \
 acinclude.test \