summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/appl/telnet/telnetd/ChangeLog4
-rw-r--r--src/appl/telnet/telnetd/configure.in2
-rw-r--r--src/appl/telnet/telnetd/sys_term.c6
3 files changed, 8 insertions, 4 deletions
diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index 0c0cd286b..45410ff59 100644
--- 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 db8163f8d..b8625bb07 100644
--- 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 79ae78f1d..8142b7152 100644
--- 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