From: Akim Demaille <akim@epita.fr>
Date: Mon, 9 Apr 2001 08:59:49 +0000 (+0000)
Subject: * automake.in (&variable_conditions_sub)
X-Git-Tag: handle-languages~120
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=4ba00a9584f43072cef6b19e1abc19d9f61e3dd7;p=automake.git

* automake.in (&variable_conditions_sub)
(&variable_value_as_list_worker): Remove dead code which used to
handle the cases where not all variables were in %conditional.
---

diff --git a/ChangeLog b/ChangeLog
index 0df15b8b..bda0ffcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-09  Akim Demaille  <akim@epita.fr>
+
+	* automake.in (&variable_conditions_sub)
+	(&variable_value_as_list_worker): Remove dead code which used to
+	handle the cases where not all variables were in %conditional.
+
 2001-04-09  Akim Demaille  <akim@epita.fr>
 
 	* automake.in (&handle_source_transform, &read_main_am_file):
diff --git a/automake.in b/automake.in
index 2b17d209..7241cd88 100755
--- a/automake.in
+++ b/automake.in
@@ -5794,40 +5794,6 @@ sub variable_conditions_sub
     }
     $vars_scanned{$var} = 1;
 
-    if (! $variable_conditionally_defined{$var})
-    {
-	foreach (split (' ', $conditional{$var}{'TRUE'}))
-	{
-	    # If a comment seen, just leave.
-	    last if /^#/;
-
-	    # Handle variable substitutions.
-	    if (/^\$\{(.*)\}$/ || /^\$\((.*)\)$/)
-	    {
-		push (@new_conds,
-		      &variable_conditions_sub ($1, $var, @parent_conds));
-	    }
-	}
-
-	# Now we want to return all permutations of the subvariable
-	# conditions.
-	my %allconds = ();
-	foreach my $item (@new_conds)
-	{
-	    foreach (split (' ', $item))
-	    {
-		s/_(TRUE|FALSE)$//;
-		$allconds{$_ . '_TRUE'} = 1;
-	    }
-	}
-
-	# Unset our entry in vars_scanned.  We only care about recursive
-	# definitions.
-	delete $vars_scanned{$var};
-
-	return &variable_conditions_permutations (sort keys %allconds);
-    }
-
     my @this_conds = ();
     foreach my $vcond (keys %{$conditional{$var}})
     {
@@ -6102,7 +6068,7 @@ sub variable_value_as_list_worker
 	# variables we've already examined.
 	&am_line_error ($parent, "variable `$var' recursively defined");
     }
-    elsif ($cond eq 'all' && $conditional{$var})
+    elsif ($cond eq 'all')
     {
 	$vars_scanned{$var} = 1;
 	foreach my $vcond (keys %{$conditional{$var}})
@@ -6111,8 +6077,9 @@ sub variable_value_as_list_worker
 	    push (@result, &value_to_list ($var, $val, $cond));
 	}
     }
-    elsif ($cond && $conditional{$var})
+    else
     {
+        $cond ||= 'TRUE';
 	$vars_scanned{$var} = 1;
 	my $onceflag;
 	foreach my $vcond (keys %{$conditional{$var}})
@@ -6129,13 +6096,6 @@ sub variable_value_as_list_worker
 	    }
 	}
     }
-    else
-    {
-	$vars_scanned{$var} = 1;
-	&check_variable_defined_unconditionally ($var, $parent);
-	$content_seen{$var} = 1;
-	push (@result, &value_to_list ($var, $conditional{$var}{'TRUE'}, $cond));
-    }
 
     # Unset our entry in vars_scanned.  We only care about recursive
     # definitions.