From 043cac051dd8aaae8828f367b7c5b86fd8b26bb3 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 30 May 1997 05:29:37 +0000 Subject: [PATCH] duplicate macro bug fix --- ChangeLog | 5 +++++ automake.in | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 429edbc..3c19828 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu May 29 23:16:02 1997 Tom Tromey + + * automake.in (scan_one_configure_file): Avoid defining ACLOCAL, + AUTOCONF, AUTOMAKE, AUTOHEADER. From David Zaroski. + Sat Feb 22 16:05:24 1997 Gordon Matzigkeit * Makefile.am (pkgdata_DATA): Under this new scheme, we no longer diff --git a/automake.in b/automake.in index 565248c..edeca68 100755 --- 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; } -- 2.7.4