+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):
}
$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}})
{
# 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}})
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}})
}
}
}
- 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.