From: Tom Tromey <tromey@redhat.com>
Date: Sun, 27 Aug 2000 20:13:19 +0000 (+0000)
Subject: 	* automake.in (am_primary_prefixes): Don't set `valid' for
X-Git-Tag: Release-1-4b~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe3ac3898b8719ece4ca73713748bbc3aa730ddf;p=thirdparty%2Fautomake.git

	* 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 63b206c56..ca44054ff 100644
--- 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 99534438c..9842b8215 100755
--- 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
 	    {