diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/appl/bsd/ChangeLog | 6 | ||||
| -rw-r--r-- | src/appl/bsd/configure.in | 7 | ||||
| -rw-r--r-- | src/appl/bsd/krlogin.c | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index b2993648a..e351f5585 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,9 @@ +Tue Oct 18 15:48:37 1994 Mark Eichin (eichin@cygnus.com) + + * configure.in (HAVE_STREAMS): test for streams interface headers + in a way that fails on sunos but works on solaris. + * krlogin.c: use HAVE_STREAMS. + Tue Oct 4 17:14:38 1994 Theodore Y. Ts'o (tytso@dcl) * krcp.c (tgt_keyproc): Add widen.h and narrow.h around diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in index 3d28a02d7..cb9bc2289 100644 --- a/src/appl/bsd/configure.in +++ b/src/appl/bsd/configure.in @@ -39,7 +39,12 @@ AC_COMPILE_CHECK([sigset_t], [#include <signal.h>], [sigset_t x], AC_DEFINE(POSIX_SIGNALS))) -AC_HAVE_HEADERS(sys/filio.h sys/sockio.h unistd.h sys/label.h ttyent.h sys/ptyvar.h lastlog.h sys/select.h sys/tty.h sys/ttold.h) +AC_HAVE_HEADERS(sys/filio.h sys/sockio.h unistd.h sys/label.h ttyent.h lastlog.h sys/select.h sys/ptyvar.h) +AC_COMPILE_CHECK([use streams interface], +[#include <sys/tty.h> +#include <sys/ttyold.h> +#include <sys/ptyvar.h>], +[], AC_DEFINE(HAVE_STREAMS)) AC_REPLACE_FUNCS(getdtablesize) CHECK_DIRENT CHECK_FCNTL diff --git a/src/appl/bsd/krlogin.c b/src/appl/bsd/krlogin.c index 2f309f496..29f61a16b 100644 --- a/src/appl/bsd/krlogin.c +++ b/src/appl/bsd/krlogin.c @@ -88,14 +88,12 @@ char copyright[] = /****** MWE *****/ /* formerly __svr4__ but that's not defined by suncc */ -#if defined(HAVE_SYS_TTY_H) && defined(HAVE_SYS_TTOLD_H) +#ifdef HAVE_STREAMS #include <sys/tty.h> #include <sys/ttold.h> -#ifdef HAVE_SYS_PTYVAR_H /* solaris actually uses packet mode, so the real macros are needed too */ #include <sys/ptyvar.h> #endif -#endif /****** MWE *****/ /* how do we tell apart irix 5 and irix 4? */ |