From c6d1731c5e7323041477de4e34d7d367d0395171 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 8 Nov 1996 23:36:36 +0000
Subject: [PATCH] ansi2knr fixes

---
 ChangeLog     |  5 +++++
 TODO          |  3 ---
 automake.in   | 15 ++++++++++++---
 compile-kr.am |  2 --
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0c44144a6..7ec4edadb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Fri Nov  8 09:49:09 1996  Tom Tromey  <tromey@cygnus.com>
 
+	* compile-kr.am ($(OBJECTS)): Removed.
+
+	* automake.in (get_object_extension): Define ANSI2KNR.  Push onto
+	@all if ansi2knr is in this directory.
+
 	* configure.in: Don't run AC_ARG_PROGRAM, AC_PROG_MAKE_SET.
 
 	* m4/init.m4: Run AM_SANITY_CHECK.
diff --git a/TODO b/TODO
index b5cffdea8..1cef398ac 100644
--- a/TODO
+++ b/TODO
@@ -145,9 +145,6 @@ Then user must use "make -k check".  This is probably more natural.
 
 Consider: "cvs" option adds some cvs-specific rules?
 
-"Cygnus"-specific features:
-* don't force info files into srcdir; ditto lex/yacc output
-
 Automake: devo/inet/Makefile.am has "all-local".  "install" depends on
 "all", but the local installs get run before the stuff in "all".  Gross.
 
diff --git a/automake.in b/automake.in
index c5920474d..9200e962d 100755
--- a/automake.in
+++ b/automake.in
@@ -643,9 +643,18 @@ sub get_object_extension
 	    # Make sure ansi2knr can be found: if no path specified,
 	    # specify "./".
 	    local ($apath) = $options{'ansi2knr'};
-	    $apath = './' . $apath
-		unless $apath =~ /\//;
-	    &define_variable ("ANSI2KNR", $apath);
+	    if ($apath =~ /\//)
+	    {
+		# Found in another directory.
+		&define_variable ("ANSI2KNR", $apath);
+	    }
+	    else
+	    {
+		# Substitution from AM_C_PROTOTYPES.  This makes it be
+		# built only when necessary.
+		&define_configure_variable ('ANSI2KNR');
+		push (@all, '$(ANSI2KNR)');
+	    }
 
 	    $output_rules .= &file_contents ('compile-kr');
 	    $output_rules .= &file_contents ('clean-kr');
diff --git a/compile-kr.am b/compile-kr.am
index 23ec073ca..46c75593f 100644
--- a/compile-kr.am
+++ b/compile-kr.am
@@ -28,5 +28,3 @@
 	@echo $(COMPILE) -c $*._c
 	@rm -f _$*.c
 	@ln $*._c _$*.c && $(COMPILE) -c _$*.c && mv _$*.o $@ && rm _$*.c
-
-$(OBJECTS): $(ANSI2KNR)
-- 
2.11.4.GIT