* configure.in, sys_term.c, telnetd.c : Have configure check for

                sys/ptyvar.h and sac.h before .c files include it.

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

diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index 4eb854f97c515f19eb8c83d6b62b979ebca03bda..daf037730569df4ecdf62a6198512e77c0351f22 100644 (file)
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 25 22:53:20 1995  Chris Provenzano  (proven@mit.edu)
+
+        * configure.in, sys_term.c, telnetd.c : Have configure check for
+                sys/ptyvar.h and sac.h before .c files include it.
+
 Sat Apr 22 00:52:01 1995  Theodore Y. Ts'o  (tytso@dcl)
 
        * telnetd.c (main): Don't use krb5_override_default_realm, as it

diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in
index 014a0be38d1d6f40ac52c9f494f19f7edad272da..7297914e9f40ef1e914240885f9aee802e3e18f6 100644 (file)
--- a/src/appl/telnet/telnetd/configure.in
+++ b/src/appl/telnet/telnetd/configure.in
@@ -35,6 +35,8 @@ AC_HEADER_TIME
 AC_CHECK_HEADERS(sys/time.h sys/tty.h)
 AC_HAVE_FUNCS(vhangup)
 AC_FUNC_CHECK(grantpt,AC_DEFINE(STREAMSPTY))
+AC_HEADER_CHECK(sac.h,AC_DEFINE(HAS_SAC))
+AC_HEADER_CHECK(sys/ptyvar.h,AC_DEFINE(HAS_PTYVAR))
 AC_FUNC_CHECK(gettosbyname,AC_DEFINE(HAS_GETTOS))
 AC_HEADER_CHECK(sys/filio.h,AC_DEFINE(FILIO_H))
 AC_HEADER_CHECK(sys/stream.h,AC_DEFINE(STREAMS))

diff --git a/src/appl/telnet/telnetd/sys_term.c b/src/appl/telnet/telnetd/sys_term.c
index efd898883934ed3ba9a2bba7b624e244b404ebac..24a4ac10c6a205963285b01c7b65519041703d7a 100644 (file)
--- a/src/appl/telnet/telnetd/sys_term.c
+++ b/src/appl/telnet/telnetd/sys_term.c
@@ -96,7 +96,9 @@ extern struct sysv sysv;
 #endif /* NEWINIT */
 
 #ifdef STREAMSPTY
-#include <sac.h>
+#ifdef HAS_SAC
+#include <sac.h> 
+#endif
 #include <sys/stropts.h>
 #endif
 

diff --git a/src/appl/telnet/telnetd/telnetd.c b/src/appl/telnet/telnetd/telnetd.c
index 4c1ca21e0f667df14d867ae679dba5c5d1f8109f..ac3ff66cd4420d13f1ac94065b1ddc942159c664 100644 (file)
--- a/src/appl/telnet/telnetd/telnetd.c
+++ b/src/appl/telnet/telnetd/telnetd.c
@@ -85,11 +85,14 @@ extern      int utmp_len;
 int    registerd_host_only = 0;
 
 #ifdef STREAMSPTY
+#include <sys/stream.h>
 # include <stropts.h>
 # include <termio.h>
 /* make sure we don't get the bsd version */
 # include "/usr/include/sys/tty.h"
+#ifdef  HAS_PTYVAR
 # include <sys/ptyvar.h>
+#endif
 
 /*
  * Because of the way ptyibuf is used with streams messages, we need