diff options
| author | Theodore Tso <tytso@mit.edu> | 1999-04-14 16:01:49 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1999-04-14 16:01:49 +0000 |
| commit | 39b4f91d40a7618e1c3ac6dc8932b9de20218877 (patch) | |
| tree | 6e1d1608c69d141245a514752154a3ceb726cd5b /src/appl/telnet/telnetd | |
| parent | 3f43d8e40871a50f389d4c966bd5cf35da8c9e40 (diff) | |
| download | krb5-39b4f91d40a7618e1c3ac6dc8932b9de20218877.tar.gz krb5-39b4f91d40a7618e1c3ac6dc8932b9de20218877.tar.xz krb5-39b4f91d40a7618e1c3ac6dc8932b9de20218877.zip | |
configure.in: Check for setupterm() in libncurses in addition to
libcurses. Only set STREAMSPTY if both grantpt and sys/stremas.h
exists. (Will be needed for Linux/Redhat 6.0)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11359 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl/telnet/telnetd')
| -rw-r--r-- | src/appl/telnet/telnetd/ChangeLog | 6 | ||||
| -rw-r--r-- | src/appl/telnet/telnetd/configure.in | 14 |
2 files changed, 17 insertions, 3 deletions
diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog index f6534995a..11df0ee5e 100644 --- a/src/appl/telnet/telnetd/ChangeLog +++ b/src/appl/telnet/telnetd/ChangeLog @@ -1,3 +1,9 @@ +1999-04-13 <tytso@rsts-11.mit.edu> + + * configure.in: Check for setupterm() in libncurses in addition to + libcurses. Only set STREAMSPTY if both grantpt and + sys/stremas.h exists. (Will be needed for Linux/Redhat 6.0) + Wed Mar 31 00:05:58 1999 Tom Yu <tlyu@mit.edu> * sys_term.c (getptyslave): Under AIX, ignore I_PUSH pckt diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in index 8a57d84eb..99ae206ea 100644 --- a/src/appl/telnet/telnetd/configure.in +++ b/src/appl/telnet/telnetd/configure.in @@ -4,8 +4,9 @@ AC_PROG_INSTALL AC_CHECK_LIB(util,main) AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP) LIBS="$LIBS -ltermcap", - AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses") -) + AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses", + AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses") +)) AC_HEADER_CHECK(termios.h,AC_DEFINE(USE_TERMIO) ac_termio=1) if test -z "$ac_termio"; then AC_HEADER_CHECK(termio.h,AC_DEFINE(SYSV_TERMIO),ac_sysv_termio=1) @@ -30,6 +31,13 @@ case $krb5_cv_host in *-*-hpux*) broken_streams=yes ;; +*-*-linux*) + # Someday Linux may have a Streams user-level interface, so checking + # for sys/stream.h may not always work. But I'm reasonably + # sure Linux will never require pushing magic streams modules onto + # pty's! :-) --- TYT + broken_streams=yes + ;; *-*-irix*) # Irix doesn't have a working granpt, and more over # you can't push anything onto a pty, so telnetd really @@ -37,7 +45,7 @@ case $krb5_cv_host in broken_streams=yes ;; esac -if test -z "$broken_streams" ; then +if test -z "$broken_streams" -a "$ac_cv_header_sys_stream" = yes; then AC_FUNC_CHECK(grantpt,AC_DEFINE(STREAMSPTY)) fi AC_MSG_CHECKING([if setpgrp takes two arguments]) |