diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/appl/telnet/telnet/ChangeLog | 12 | ||||
| -rw-r--r-- | src/appl/telnet/telnet/Makefile.in | 5 | ||||
| -rw-r--r-- | src/appl/telnet/telnet/configure.in | 22 |
3 files changed, 30 insertions, 9 deletions
diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog index 4ce0441f7..6bce3596a 100644 --- a/src/appl/telnet/telnet/ChangeLog +++ b/src/appl/telnet/telnet/ChangeLog @@ -1,3 +1,15 @@ +Fri Nov 18 01:21:54 1994 Mark Eichin <eichin@cygnus.com> + + * Makefile.in (install): install telnet man page. + (from Ted Lemon <mellon@ipd.wellsfargo.com>). + +Fri Nov 18 00:38:18 1994 Mark Eichin <eichin@cygnus.com> + + * configure.in (LIBS): use WITH_KRB4, CHECK_SIGNALS, and cache + cc_t in termio.h check. (from epeisach) + * Makefile.in (K4LIB): set to @K4LIB@ instead of explicit setting. + (telnet): link with $(K4LIB). (from epeisach). + Tue Nov 8 01:42:13 1994 Theodore Y. Ts'o (tytso@dcl) * commands.c (EncryptList): Fix spelling typo. diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in index ab4d93931..f51b53e6f 100644 --- a/src/appl/telnet/telnet/Makefile.in +++ b/src/appl/telnet/telnet/Makefile.in @@ -26,7 +26,7 @@ LOCALINCLUDES=-I.. -I$(srcdir)/.. CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES) ARPA_TELNET= $(srcdir)/../arpa/telnet.h COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -K4LIB = $(KRB4)/lib/libkrb.a +K4LIB = @K4LIB@ KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB) DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) @@ -43,13 +43,14 @@ OBJS= authenc.o commands.o main.o network.o ring.o sys_bsd.o \ all:: telnet telnet: $(OBJS) $(DEPKLIB) - $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS) + $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(K4LIB) $(LIBS) clean:: $(RM) telnet install: $(INSTALL_PROGRAM) telnet $(DESTDIR)$(CLIENT_BINDIR)/telnet + $(INSTALL_DATA) telnet.1 ${DESTDIR}$(CLIENT_MANDIR)/telnet.1 authenc.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET) commands.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET) diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in index 3bd3af486..a29cd931e 100644 --- a/src/appl/telnet/telnet/configure.in +++ b/src/appl/telnet/telnet/configure.in @@ -16,8 +16,14 @@ 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) if test -z "$ac_sysv_termio"; then -AC_COMPILE_CHECK([cc_t],[#include <termio.h>], -[cc_t foo;],,AC_DEFINE(NO_CC_T)) + AC_MSG_CHECKING([for cc_t in termio.h]) + AC_CACHE_VAL(krb_cv_type_cc_t, + [AC_TRY_LINK([cc_t],[#include <termio.h>], + [cc_t foo;],krb_cv_type_cc_t=yes,krb_cv_type_cc_t=no)]) + AC_MSG_RESULT($krb_cv_type_cc_t) + if test $krb_cv_type_cc_t = no; then + AC_DEFINE(NO_CC_T) + fi fi fi AC_FUNC_CHECK(gettosbyname,AC_DEFINE(HAS_GETTOS)) @@ -27,11 +33,13 @@ AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT)) AC_FUNC_CHECK(setupterm,AC_DEFINE(HAS_SETUPTERM)) AC_CHECK_LIB(ndbm,main) AC_CHECK_LIB(dbm,main) -AC_FUNC_CHECK(sigprocmask, -AC_COMPILE_CHECK([sigset_t], -[#include <signal.h>], -[sigset_t x], -AC_DEFINE(POSIX_SIGNALS))) +CHECK_SIGNALS +WITH_KRB4 +AC_ARG_WITH([krb4],,dnl +ADD_DEF(-DKRB4) +K4LIB="$(KRB4)/lib/libkrb.a $(KRB4)/lib/libdes.a", +K4LIB=) +AC_SUBST(K4LIB) AC_CHECK_LIB(socket,main) AC_CHECK_LIB(nsl,main) V5_AC_OUTPUT_MAKEFILE |