* automake.in (variable_value_as_list_worker): Handle entries in

	%am_var_defs.  Fixes listval.test.

diff --git a/ChangeLog b/ChangeLog
index 4b146b3218194d2dd41de3666ef58793897a8c83..f06aa9b4ce8364fc8fb44905d600e94fba39fe7b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-28  Tom Tromey  <tromey@redhat.com>
+
+       * automake.in (variable_value_as_list_worker): Handle entries in
+       %am_var_defs.  Fixes listval.test.
+
 2001-01-26  Akim Demaille  <akim@epita.fr>
 
        * automake.in (handle_texinfo): Don't use $conf_pat, just

diff --git a/THANKS b/THANKS
index b8e0a7e3c5c5aba76c1d8e2661621c29c4c006d2..7aef8e6646d4d0a1e24b09157803f9ce27787295 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -2,6 +2,7 @@ Automake was originally written by David J. MacKenzie <djm@uunet.uu.net>.
 It would not be what it is today without the invaluable help of these
 people:
 
+Adam J. Richter                adam@yggdrasil.com
 Akim Demaille          demaille@inf.enst.fr
 Alex Hornby            alex@anvil.co.uk
 Alexandre Duret-Lutz   duret_g@epita.fr

diff --git a/automake.in b/automake.in
index 6907d312ae9a5dadc20555d1ffa43c5c9c16f923..00f5b2c7dfa8b71846e36188e5d0853e0b4e4fc9 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5971,7 +5971,7 @@ sub variable_value_as_list_worker
     {
        &am_line_error ($var, "\`$var' is target; expected variable");
     }
-    elsif (! defined $contents{$var})
+    elsif (! defined $contents{$var} && ! defined $am_var_defs{$var})
     {
        &am_line_error ($parent, "variable \`$var' not defined");
     }
@@ -6012,6 +6012,13 @@ sub variable_value_as_list_worker
            }
        }
     }
+    elsif (defined $am_var_defs{$var})
+    {
+       $vars_scanned{$var} = 1;
+       &variable_conditionally_defined ($var, $parent);
+       $content_seen{$var} = 1;
+       push (@result, &value_to_list ($var, $am_var_defs{$var}, $cond));
+    }
     else
     {
        $vars_scanned{$var} = 1;

diff --git a/tests/Makefile.in b/tests/Makefile.in
index b00006e2adef5a683a3cd170e5ef43dcc4c32aa6..bd7d1cb7a2698d9af9d50d1d24414b0e8e1c5359 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -204,6 +204,7 @@ interp2.test \
 java.test \
 javaprim.test \
 javasubst.test \
+listval.test \
 ldadd.test \
 ldflags.test \
 lex.test \