mark conditonally-seen vars as seen

diff --git a/ChangeLog b/ChangeLog
index d0cc469ce7efbad9a2417f17d2fcc9cc293c654e..9d6105f2bd7da9d98224566c8497059084abac4b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Tue Aug  5 17:49:54 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (variable_defined): Mark variable is seen, even if
+       only conditionally seen.
+
        * Makefile.am: Check for bad splits.
        * automake.in (various): Use split(' ',...), not split(/ /,...).
 

diff --git a/automake.in b/automake.in
index 7909f4db5368425526b27f8c2a83bf8e26357e03..479f1c5ed9fba94f7c4b6e214592ff6f0fdab90c 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4368,6 +4368,10 @@ sub variable_defined
            {
                if (&conditional_same ($cond, shift (@cond_vars)))
                {
+                   # Even a conditional examination is good enough
+                   # for us.  FIXME: really should maintain examined
+                   # status on a per-condition basis.
+                   $content_seen{$var} = 1;
                    return 1;
                }
                shift (@cond_vars);