ignore vars with config subs in their names

diff --git a/ChangeLog b/ChangeLog
index 9d6105f2bd7da9d98224566c8497059084abac4b..c2355c1aaf01feec794650114acbc7433a28541d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Tue Aug  5 17:49:54 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (value_to_list): If variable name contains configure
+       substitution, then just ignore it.
+
        * automake.in (variable_defined): Mark variable is seen, even if
        only conditionally seen.
 

diff --git a/automake.in b/automake.in
index 479f1c5ed9fba94f7c4b6e214592ff6f0fdab90c..48793c984d6ae83e4306360f86172587f97661d9 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1809,7 +1809,8 @@ sub check_typos
     local ($varname, $primary);
     foreach $varname (keys %contents)
     {
-       foreach $primary ('_SOURCES', '_LIBADD', '_LDADD', '_LDFLAGS', '_DEPENDENCIES')
+       foreach $primary ('_SOURCES', '_LIBADD', '_LDADD', '_LDFLAGS',
+                         '_DEPENDENCIES')
        {
            if ($varname =~ /$primary$/ && ! $content_seen{$varname})
            {
@@ -4694,6 +4695,11 @@ sub value_to_list
        if (/^\$\{([^}]*)\}$/ || /^\$\(([^)]*)\)$/)
        {
            local ($varname) = $1;
+
+           # If the user uses a losing variable name, just ignore it.
+           # This isn't ideal, but people have requested it.
+           next if ($varname =~ /\@.*\@/);
+
            local ($from, $to);
            local (@temp_list);
            if ($varname =~ /^([^:]*):([^=]*)=(.*)$/)