Only include <sys/tty.h> if HAVE_SYS_TTY_H is defined by configure

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4639 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index 0c0cd286ba7e602888e6e3c9734cfb958d24c7df..45410ff5958c03769079b2c4d352f1bdf4d287cb 100644 (file)
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,5 +1,9 @@
 Mon Nov  7 22:16:51 1994  Theodore Y. Ts'o  (tytso@dcl)
 
+       * configure.in: 
+         sys_term.c: Only include <sys/tty.h> if HAVE_SYS_TTY_H is
+                 defined by configure.
+
         * configure.in: Check for sys/time.h and time.h.
 
        * defs.h: Pull in <sys/time.h> and <time.h> as necessary.

diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in
index db8163f8dc3d654fc1ce7522a6e58286b03c74b0..b8625bb07002225f86257f9a277a979806cafd62 100644 (file)
--- a/src/appl/telnet/telnetd/configure.in
+++ b/src/appl/telnet/telnetd/configure.in
@@ -24,7 +24,7 @@ AC_COMPILE_CHECK([cc_t],[#include <termio.h>],
 fi
 fi
 AC_HEADER_TIME
-AC_CHECK_HEADERS(sys/time.h)
+AC_CHECK_HEADERS(sys/time.h sys/tty.h)
 AC_HAVE_FUNCS(vhangup)
 AC_FUNC_CHECK(grantpt,AC_DEFINE(STREAMSPTY))
 AC_FUNC_CHECK(gettosbyname,AC_DEFINE(HAS_GETTOS))

diff --git a/src/appl/telnet/telnetd/sys_term.c b/src/appl/telnet/telnetd/sys_term.c
index 79ae78f1d45d54acc6b55d1d39b5da41d6c4bb3f..8142b7152113b8d15f002e7136e90f4a83969e78 100644 (file)
--- a/src/appl/telnet/telnetd/sys_term.c
+++ b/src/appl/telnet/telnetd/sys_term.c
@@ -108,11 +108,11 @@ extern struct sysv sysv;
 #include <sys/resource.h>
 #include <sys/proc.h>
 #endif
-#ifndef linux
+       /* For what platforms do we really need sys/tty.h? */
+#ifdef HAVE_SYS_TTY_H
 #include <sys/tty.h>
-#else
-#include <linux/tty.h>
 #endif
+       
 #ifdef t_erase
 #undef t_erase
 #undef t_kill