diff options
| author | Theodore Tso <tytso@mit.edu> | 1994-12-13 20:22:56 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1994-12-13 20:22:56 +0000 |
| commit | c4e770805a18bfc46bfe4b7d035712b1aab51c78 (patch) | |
| tree | a35d9893ed1227b42663559743eb9de0a5bb9ca7 /src | |
| parent | 79f8c56eb28567fb1aeb3da0ff9eddcef6c7f12c (diff) | |
| download | krb5-c4e770805a18bfc46bfe4b7d035712b1aab51c78.tar.gz krb5-c4e770805a18bfc46bfe4b7d035712b1aab51c78.tar.xz krb5-c4e770805a18bfc46bfe4b7d035712b1aab51c78.zip | |
externs.h: If USE_TERMIO is defined and SYSV_TERMIO isn't, then always
#define termio to termios.
configure: Set K4LIBS correctly.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4728 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/appl/telnet/telnet/ChangeLog | 7 | ||||
| -rw-r--r-- | src/appl/telnet/telnet/configure.in | 2 | ||||
| -rw-r--r-- | src/appl/telnet/telnet/externs.h | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog index 6bce3596a..e98124dbf 100644 --- a/src/appl/telnet/telnet/ChangeLog +++ b/src/appl/telnet/telnet/ChangeLog @@ -1,3 +1,10 @@ +Thu Dec 1 13:09:34 1994 <tytso@rsx-11.mit.edu> + + * externs.h: If USE_TERMIO is defined and SYSV_TERMIO isn't, + then always #define termio to termios. + + * configure: Set K4LIBS correctly. + Fri Nov 18 01:21:54 1994 Mark Eichin <eichin@cygnus.com> * Makefile.in (install): install telnet man page. diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in index a29cd931e..10dd67ead 100644 --- a/src/appl/telnet/telnet/configure.in +++ b/src/appl/telnet/telnet/configure.in @@ -37,7 +37,7 @@ CHECK_SIGNALS WITH_KRB4 AC_ARG_WITH([krb4],,dnl ADD_DEF(-DKRB4) -K4LIB="$(KRB4)/lib/libkrb.a $(KRB4)/lib/libdes.a", +K4LIB='$(KRB4)/lib/libkrb.a $(KRB4)/lib/libdes.a', K4LIB=) AC_SUBST(K4LIB) AC_CHECK_LIB(socket,main) diff --git a/src/appl/telnet/telnet/externs.h b/src/appl/telnet/telnet/externs.h index cc363e817..ae25e853d 100644 --- a/src/appl/telnet/telnet/externs.h +++ b/src/appl/telnet/telnet/externs.h @@ -69,10 +69,12 @@ # include <sys/termio.h> # else # include <termios.h> -# define termio termios # endif # endif #endif +#if defined(USE_TERMIO) && !defined(SYSV_TERMIO) +# define termio termios +#endif #if defined(NO_CC_T) || !defined(USE_TERMIO) # if !defined(USE_TERMIO) typedef char cc_t; |