ansi2knr fix

diff --git a/ChangeLog b/ChangeLog
index 01f1040..18ad0d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Tue Mar 25 22:09:45 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (scan_one_configure_file): Don't define ANSI2KNR as
+       a configure varriable.
+
        * m4/missing.m4: Run test in a subshell.  From Gord Matzigkeit.
 
 Mon Mar 24 23:28:59 1997  Tom Tromey  <tromey@cygnus.com>

diff --git a/automake.in b/automake.in
index fb37044..d336195 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3760,7 +3760,10 @@ sub scan_one_configure_file
        {
            $configure_vars{$3} = 1;
        }
-       if (/$AC_SUBST_PATTERN/o)
+
+       # Explicitly avoid ANSI2KNR -- we AC_SUBST that in protos.m4,
+       # but later define it elsewhere.  This is pretty hacky.
+       if (/$AC_SUBST_PATTERN/o && $1 ne 'ANSI2KNR')
        {
            $configure_vars{$1} = 1;
        }