* automake.in (am_primary_prefixes): Don't set `valid' for

	configure variables that don't satisfy the other constraints.
	Fixes PR automake/68.

diff --git a/ChangeLog b/ChangeLog
index 63b206c56099a720ef5939c215337999ca558653..ca44054ff189c49d6d8da5ea31dee592d6fcd3bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-27  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (am_primary_prefixes): Don't set `valid' for
+       configure variables that don't satisfy the other constraints.
+       Fixes PR automake/68.
+
 2000-04-14  Victor V. Vengerov <vvv@oktet.ru>
 
        Fix for PR automake/67.

diff --git a/automake.in b/automake.in
index 99534438c9558bf50674eda6facc22a2cd68c654..9842b82156b17fec7e01611a9b71225097d95a75 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -7013,15 +7013,15 @@ sub am_primary_prefixes
        if ($varname =~ /^(nobase_)?(dist_|nodist_)?(.*)_$primary$/)
        {
            if (($2 ne '' && ! $can_dist)
-               || (! defined $valid{$3}
-                   && ! &variable_defined ($3 . 'dir')
-                   # Note that a configure variable is always
-                   # legitimate.  It is natural to name such
-                   # variables after the primary, so we explicitly
-                   # allow it.
-                   && ! defined $configure_vars{$varname}))
-           {
-               &am_line_error ($varname, "invalid variable \`$varname'");
+               || (! defined $valid{$3} && ! &variable_defined ($3 . 'dir')))
+           {
+               # Note that a configure variable is always legitimate.
+               # It is natural to name such variables after the
+               # primary, so we explicitly allow it.
+               if (! defined $configure_vars{$varname})
+               {
+                   &am_line_error ($varname, "invalid variable \`$varname'");
+               }
            }
            else
            {