From: Richard Boulton <richard@tartarus.org>
Date: Mon, 11 Mar 2002 17:24:13 +0000 (+0000)
Subject: automake.in (check_typos): Allow variables with reserved
X-Git-Tag: branchpoint-1-6~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54ad2a60245c5e3e85a9683011295d509b2c190f;p=thirdparty%2Fautomake.git

automake.in (check_typos): Allow variables with reserved
suffices (such as _LDFLAGS) and prefixes which aren't
recognised if the variable is defined in configure.ac.
Fixes acsubst.test.
---

diff --git a/ChangeLog b/ChangeLog
index 739455b8c..97adeecbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-11  Richard Boulton <richard@tartarus.org>
+
+	* automake.in (check_typos): Allow variables with reserved
+	suffices (such as _LDFLAGS) and prefixes which aren't
+	recognised if the variable is defined in configure.ac.
+	Fixes acsubst.test.
+
 2002-03-11  Richard Boulton <richard@tartarus.org>
 
 	* tests/acsubst.test: New test, by Alexandre Duret-Lutz
diff --git a/automake.in b/automake.in
index 92a2ba756..27b5f1b42 100755
--- a/automake.in
+++ b/automake.in
@@ -3018,7 +3018,11 @@ sub check_typos ()
 	{
 	  macro_error ($varname,
 		       "invalid unused variable name: `$varname'")
-	    if $varname =~ /$primary$/ && ! $content_seen{$varname};
+	    # Note that a configure variable is always legitimate.
+	    # It is natural to name such variables after the
+	    # primary, so we explicitly allow it.
+	    if $varname =~ /$primary$/ && ! $content_seen{$varname}
+		&& ! exists $configure_vars{$varname};
 	}
     }
 }