texinfo fixlet from ian

diff --git a/ChangeLog b/ChangeLog
index f830d7300a354a010fd0cd877bc3f115882e938b..36af336ceef17428b8c2085fcf805e8b575b449f 100644 (file)
--- 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 16e2dcef9db0538a4e05f18b22d9ff070b7a8a3c..74c3f276ecea9c8b32a07e7919d6bce4e1ca17f7 100755 (executable)
--- 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 53e5c665208af772fa188145fcfd502d5280e602..2dc97d0d7b2c44257a9c7d8cfac846b77d6b850c 100644 (file)
--- 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 763d808dd4636092240bfefc3082c655cc9ec71a..94a4e09684dab89f35ec7cd2888dcda927dc85d9 100644 (file)
--- 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 7f6529a533ede074bdcea3a9bbc7f76e850af802..f5b2f2bd2bc948ea4f76f27dbafa74f69c3b6f64 100644 (file)
--- 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 (executable)
index 0000000..2497d78
--- /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