From: Tom Tromey <tromey@redhat.com>
Date: Mon, 29 Jan 2001 06:15:50 +0000 (+0000)
Subject: 	* automake.in (variable_value_as_list_worker): Handle entries in
X-Git-Tag: Release-1-4d~88
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=716a16212a96410499de58f4086ed8aee2d2af69;p=automake.git

	* automake.in (variable_value_as_list_worker): Handle entries in
	%am_var_defs.  Fixes listval.test.
---

diff --git a/ChangeLog b/ChangeLog
index 4b146b32..f06aa9b4 100644
--- 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 b8e0a7e3..7aef8e66 100644
--- 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 6907d312..00f5b2c7 100755
--- 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 b00006e2..bd7d1cb7 100644
--- 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 \