Fix Freedbsd build problem with patch from more recent texinfo sources.

	* info/terminal.c (terminal_prep_terminal): Only use OCRNL and
		ONLCR if they are defined.  Reported by many people.

From-SVN: r15003

diff --git a/texinfo/ChangeLog b/texinfo/ChangeLog
index 0e6fe76..aea2b38 100644 (file)
--- a/texinfo/ChangeLog
+++ b/texinfo/ChangeLog
@@ -16,6 +16,11 @@ Mon May 26 12:44:43 1997  Ian Lance Taylor  <ian@cygnus.com>
 
        * texinfo.tex: Update to newest FSF version (2.201).
 
+Fri Mar 14 15:05:17 1997  Karl Berry  <karl@cs.umb.edu>
+
+       * info/terminal.c (terminal_prep_terminal): Only use OCRNL and
+               ONLCR if they are defined.  Reported by many people.
+
 Wed Feb 12 11:15:16 1997  Michael Meissner  <meissner@cygnus.com>
 
        * util/texindex.c (main): Make main an int function, not void.

diff --git a/texinfo/info/terminal.c b/texinfo/info/terminal.c
index 9c10176..7275d00 100644 (file)
--- a/texinfo/info/terminal.c
+++ b/texinfo/info/terminal.c
@@ -637,7 +637,14 @@ terminal_prep_terminal ()
 
 #if defined (HAVE_TERMIOS_H) || defined (HAVE_TERMIO_H)
   ttybuff.c_iflag &= (~ISTRIP & ~INLCR & ~IGNCR & ~ICRNL & ~IXON);
-  ttybuff.c_oflag &= (~ONLCR & ~OCRNL);
+/* These output flags are not part of POSIX, so only use them if they
+   are defined.  */
+#ifdef ONLCR
+  ttybuff.c_oflag &= ~ONLCR ;
+#endif
+#ifdef OCRNL
+  ttybuff.c_oflag &= ~OCRNL;
+#endif
   ttybuff.c_lflag &= (~ICANON & ~ECHO);
 
   ttybuff.c_cc[VMIN] = 1;