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 739455b..97adeec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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
        * tests/acsubst2.test: New test, by Alexandre Duret-Lutz
        * tests/Makefile.am (TEST): Added acsubst.test and acsubst2.test

diff --git a/automake.in b/automake.in
index 92a2ba7..27b5f1b 100755 (executable)
--- 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};
        }
     }
 }