From ac6bacbd5df84f77ef7a8858bbf298adb30f8cde Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Wed, 27 Aug 1997 19:04:11 +0000
Subject: [PATCH] texinfo handling fix

---
 ChangeLog   | 5 +++++
 THANKS      | 1 +
 automake.in | 5 +++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d29e01f55..aa60c06a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 27 12:56:50 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* automake.in (handle_texinfo): Only require texinfo.tex in
+	appropriate situations.  Report from Paul D. Smith.
+
 Mon Aug 25 15:45:52 1997  Tom Tromey  <tromey@cygnus.com>
 
 	* automake.in (scan_dependency_file): Fix so that
diff --git a/THANKS b/THANKS
index 6d5b5fee4..2e66e4d6a 100644
--- a/THANKS
+++ b/THANKS
@@ -3,6 +3,7 @@ It would not be what it is today without the invaluable help of these
 people:
 
 "Markus F.X.J. Oberhumer" <k3040e4@wildsau.idv-edu.uni-linz.ac.at>
+"Paul D. Smith" <psmith@BayNetworks.COM>
 Akim Demaille <demaille@inf.enst.fr>
 Alexander V. Lukyanov <lav@yars.free.net>
 Alexandre Oliva <oliva@dcc.unicamp.br>
diff --git a/automake.in b/automake.in
index e894d19e8..eed301b16 100755
--- a/automake.in
+++ b/automake.in
@@ -2028,6 +2028,7 @@ sub handle_texinfo
     }
 
     # Handle location of texinfo.tex.
+    local ($need_texi_file) = 0;
     if ($cygnus_mode)
     {
 	&define_variable ('TEXINFO_TEX',
@@ -2040,6 +2041,7 @@ sub handle_texinfo
     elsif (! &variable_defined ('TEXINFO_TEX'))
     {
 	&define_variable ('TEXINFO_TEX', '$(srcdir)/texinfo.tex');
+	$need_texi_file = 1;
     }
     local ($xxform) = &dirname (&variable_value ('TEXINFO_TEX'));
     $xxform =~ s/(\W)/\\$1/g;
@@ -2097,8 +2099,7 @@ sub handle_texinfo
     # when in Cygnus mode; instead we defined TEXINFO_TEX explicitly
     # up above.
     &require_file_with_line ('info_TEXINFOS', $FOREIGN, 'texinfo.tex')
-	unless (defined $options{'no-texinfo.tex'}
-		|| &variable_defined ('TEXINFO_TEX'));
+	if $need_texi_file || ! defined $options{'no-texinfo.tex'};
 }
 
 # Handle any man pages.
-- 
2.47.2