From 931ea4e5d2913afe28a3ad86ca415db9740b3872 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Thu, 20 Mar 1997 07:38:20 +0000
Subject: [PATCH] fixlets

---
 ChangeLog           |  9 +++++++++
 automake.in         | 15 +++++++++++----
 tests/ChangeLog     |  4 ++++
 tests/exsource.test |  6 ++++++
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e511bf7..6777b95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Mar 20 00:16:54 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* automake.in (scan_one_configure_file): Explicitly handle
+	AC_CONFIG_HEADER so we can avoid spurious warnings.
+	(obsolete_macros): Removed AC_CONFIG_HEADER.
+
+	* automake.in (handle_yacc_lex_cxx): Perl 4 fixes.  From Greg
+	A. Woods.
+
 Wed Mar 19 00:35:13 1997  Tom Tromey  <tromey@cygnus.com>
 
 	* Released 1.1m.
diff --git a/automake.in b/automake.in
index 9b7cd01..7696838 100755
--- a/automake.in
+++ b/automake.in
@@ -226,8 +226,10 @@ $cygnus_mode = 0;
      'AC_FEATURE_EXIT', 0,
      'AC_SYSTEM_HEADER', 0,
 
-     # Autoconf macros that Automake enhances.
-     'AC_CONFIG_HEADER', "use \`AM_CONFIG_HEADER'",
+     # Note that we do not handle this one, because it is still run
+     # from AM_CONFIG_HEADER.  So we deal with it specially in
+     # handle_configure.
+     # 'AC_CONFIG_HEADER', "use \`AM_CONFIG_HEADER'",
 
      'fp_C_PROTOTYPES', "use \`AM_C_PROTOTYPES'",
      'fp_PROG_CC_STDC', "use \`AM_PROG_CC_STDC'",
@@ -782,7 +784,7 @@ sub handle_yacc_lex_cxx
 	foreach (keys %yacc_sources)
 	{
 	    /(\..*)$/;
-	    output_yacc_build_rule ($1, $yacc_count > 1)
+	    &output_yacc_build_rule ($1, $yacc_count > 1)
 		if (! defined $seen_suffix{$1});
 	    $seen_suffix{$1} = 1;
 	}
@@ -798,7 +800,7 @@ sub handle_yacc_lex_cxx
 	foreach (keys %lex_sources)
 	{
 	    /(\..*)$/;
-	    output_lex_build_rule ($1, $lex_count > 1)
+	    &output_lex_build_rule ($1, $lex_count > 1)
 		if (! defined $seen_suffix{$1});
 	    $seen_suffix{$1} = 1;
 	}
@@ -3654,6 +3656,11 @@ sub scan_one_configure_file
 	if (/A([CM])_CONFIG_HEADER\s*\((.*)\)/
 	    && $2 ne '[$1]')
 	{
+	    &am_conf_line_error
+ 		($filename, $.,
+		 "\`AC_CONFIG_HEADER' is obsolete; use \`AM_CONFIG_HEADER'")
+ 		    if $1 eq 'C';
+
 	    $config_header_line = $.;
 	    $config_name = $2;
 	    if ($config_name =~ /^([^:]+):(.+)$/)
diff --git a/tests/ChangeLog b/tests/ChangeLog
index a89b941..86976c5 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar 20 00:34:33 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* exsource.test: Exit if not using GNU make.
+
 Tue Mar 18 22:36:34 1997  Tom Tromey  <tromey@cygnus.com>
 
 	* remake2.test: Changed for `missing' support.
diff --git a/tests/exsource.test b/tests/exsource.test
index 0c5c09d..e01e3bf 100755
--- a/tests/exsource.test
+++ b/tests/exsource.test
@@ -5,6 +5,12 @@
 
 . $srcdir/defs || exit 1
 
+# This test relies on GNU make.
+make --version > /dev/null 2>&1 || {
+   # Nope.
+   exit 0
+}
+
 cat >> configure.in << 'END'
 AC_PROG_CC
 END
-- 
2.7.4