duplicate macro bug fix

diff --git a/ChangeLog b/ChangeLog
index 429edbca58dfc890ab1b0b62864a761ac3450717..3c19828d441a14492b4a71fad0bede90925ca95a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 29 23:16:02 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (scan_one_configure_file): Avoid defining ACLOCAL,
+       AUTOCONF, AUTOMAKE, AUTOHEADER.  From David Zaroski.
+
 Sat Feb 22 16:05:24 1997  Gordon Matzigkeit  <gord@gnu.ai.mit.edu>
 
        * Makefile.am (pkgdata_DATA): Under this new scheme, we no longer

diff --git a/automake.in b/automake.in
index 565248c98898c52dfabf660a790740487197a8f4..edeca68995f4867a531df74331e1e28072ea26e4 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4022,11 +4022,16 @@ sub scan_one_configure_file
 
        # Explicitly avoid ANSI2KNR -- we AC_SUBST that in protos.m4,
        # but later define it elsewhere.  This is pretty hacky.  We
-       # also explicitly avoid INSTALL_SCRIPT because it is defined
-       # in header-vars.am.  FIXME.
+       # also explicitly avoid INSTALL_SCRIPT and some other
+       # variables because they are defined in header-vars.am.
+       # FIXME.
        if (/$AC_SUBST_PATTERN/o
            && $1 ne 'ANSI2KNR'
-           && $1 ne 'INSTALL_SCRIPT')
+           && $1 ne 'INSTALL_SCRIPT'
+           && $1 ne 'ACLOCAL'
+           && $1 ne 'AUTOCONF'
+           && $1 ne 'AUTOMAKE'
+           && $1 ne 'AUTOHEADER')
        {
            $configure_vars{$1} = 1;
        }