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

diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index 6bce3596a42e8888929d0d7e9d263318aa38e542..e98124dbfc90d98eebd55a603bd5210cf4652961 100644 (file)
--- 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 a29cd931ef28a6f3767ffbb097791b246b47a69c..10dd67ead8443eb5ef6bf4f10a1f6ae856de2859 100644 (file)
--- 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 cc363e817f7268baf29cf61f81562d6933ac1d10..ae25e853d5902cabf656cceb8fab1ae6826d0a24 100644 (file)
--- 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;