From 41318b87f73940d202b48e492b7ea272c3e8055c Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Sat, 14 Feb 1998 05:28:20 +0000
Subject: [PATCH] texinfo fixlet from ian

---
 ChangeLog           |  5 +++++
 automake.in         |  2 +-
 tests/ChangeLog     |  2 ++
 tests/Makefile.am   |  2 +-
 tests/Makefile.in   |  2 +-
 tests/texinfo5.test | 18 ++++++++++++++++++
 6 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100755 tests/texinfo5.test

diff --git a/ChangeLog b/ChangeLog
index f830d730..36af336c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 13 14:35:39 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* automake.in (handle_texinfo): Correct condition for whether
+	texinfo.tex is required.  [Test texinfo5.test]
+
 Fri Feb 13 00:28:53 1998  Tom Tromey  <tromey@cygnus.com>
 
 	* Released 1.2e.
diff --git a/automake.in b/automake.in
index 16e2dcef..74c3f276 100755
--- a/automake.in
+++ b/automake.in
@@ -2176,7 +2176,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')
-	if $need_texi_file || ! defined $options{'no-texinfo.tex'};
+	if $need_texi_file && ! defined $options{'no-texinfo.tex'};
 }
 
 # Handle any man pages.
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 53e5c665..2dc97d0d 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,7 @@
 Fri Feb 13 00:36:38 1998  Tom Tromey  <tromey@cygnus.com>
 
+	* texinfo5.test (info_TEXINFOS): New file.
+
 	* condman.test: New file.
 
 	* Makefile.am (distclean-local): Ignore rm return value.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 763d808d..94a4e096 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,7 +28,7 @@ seenc.test cygwin32.test lisp.test stamph.test ldadd.test \
 version2.test conf2.test cond.test cond2.test xsource.test \
 libobj6.test depend3.test output5.test ammissing.test install.test \
 libobj7.test objc.test cond3.test cxxcpp.test aclocal.test alpha.test \
-whoami.test unused.test condman.test
+whoami.test unused.test condman.test texinfo5.test
 
 EXTRA_DIST = defs $(TESTS)
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7f6529a5..f5b2f2bd 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -89,7 +89,7 @@ seenc.test cygwin32.test lisp.test stamph.test ldadd.test \
 version2.test conf2.test cond.test cond2.test xsource.test \
 libobj6.test depend3.test output5.test ammissing.test install.test \
 libobj7.test objc.test cond3.test cxxcpp.test aclocal.test alpha.test \
-whoami.test unused.test condman.test
+whoami.test unused.test condman.test texinfo5.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/tests/texinfo5.test b/tests/texinfo5.test
new file mode 100755
index 00000000..2497d782
--- /dev/null
+++ b/tests/texinfo5.test
@@ -0,0 +1,18 @@
+#! /bin/sh
+
+# Test to make sure that texinfo.tex is not required by --cygnus.
+# Report from Ian Taylor.
+. $srcdir/defs || exit 1
+
+cat >> configure.in << 'END'
+AM_MAINTAINER_MODE
+AM_EXEEXT
+END
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = ian.texi
+END
+
+echo '@setfilename ian.info' > ian.texi
+
+$AUTOMAKE --cygnus
-- 
2.43.5