+1998-11-09 Tom Tromey <tromey@cygnus.com>
+
+ * automake.in (read_am_file): `conditional_stack' isn't a
+ function. Correctly add new value to existing value in `+='
+ case.
+
1998-10-29 Gary V. Vaughan <gvaughan@oranda.demon.co.uk>
* automake.in (parse_arguments): Fixed type of -c for copying
if (@conditional_stack)
{
local ($found) = 0;
- local ($val) = $contents{$last_var_name};
- $val = "e_cond_val ($val);
+ local ($val);
if ($conditional{$last_var_name})
{
if ($type eq '+')
{
local ($vcond) = shift (@cond_vals);
push (@new_vals, $vcond);
- if (&conditional_stack ($vcond, $cond_string))
+ if (&conditional_same ($vcond, $cond_string))
{
$found = 1;
- shift (@cond_vals);
- push (@new_vals, $val);
+ $val = (&unquote_cond_val (shift (@cond_vals))
+ . ' ' . $value);
+ push (@new_vals, "e_cond_val ($val));
}
else
{
&check_ambiguous_conditional ($last_var_name,
$cond_string);
$conditional{$last_var_name} .= ' ';
+ $val = $value;
}
}
else
{
$conditional{$last_var_name} = '';
+ $val = $contents{$last_var_name};
}
if (! $found)
{
$conditional{$last_var_name} .= ($cond_string
. ' '
- . $val);
+ . "e_cond_val ($val));
}
}