* automake.in (read_am_file): `conditional_stack' isn't a

	function.  Correctly add new value to existing value in `+='
	case.

diff --git a/ChangeLog b/ChangeLog
index ba8e89fea42ff55a87821f8c8e7ad89047aaf7c4..b858327a8dc244c8663fff155acc77b94cccd176 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/automake.in b/automake.in
index 21fc180adeabc7e1f4c3647473d3f05823e6b381..c68b6a5ab98ffe9b80095af5b71cc67d3ac817d7 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5843,8 +5843,7 @@ sub read_am_file
            if (@conditional_stack)
            {
                local ($found) = 0;
-               local ($val) = $contents{$last_var_name};
-               $val = &quote_cond_val ($val);
+               local ($val);
                if ($conditional{$last_var_name})
                {
                    if ($type eq '+')
@@ -5858,11 +5857,12 @@ sub read_am_file
                        {
                            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, &quote_cond_val ($val));
                            }
                            else
                            {
@@ -5881,17 +5881,19 @@ sub read_am_file
                        &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);
+                                                    . &quote_cond_val ($val));
                }
            }