summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/appl/telnet/telnet/ChangeLog5
-rw-r--r--src/appl/telnet/telnet/Makefile.in4
-rw-r--r--src/appl/telnet/telnet/configure.in5
3 files changed, 7 insertions, 7 deletions
diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index e65952bd3d..9b42a41346 100644
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 27 13:56:12 1995 Mark Eichin <eichin@cygnus.com>
+
+ * Makefile.in (telnet): use KRB4_LIB directly.
+ * configure.in: use WITH_KRB4 as-is.
+
Fri Apr 21 12:45:40 1995 Mark Eichin <eichin@cygnus.com>
* main.c (main): Handle -k if KRB5 is defined. (from ian@cygnus.com)
diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in
index 96cae1cff6..951da68cac 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 = @K4LIB@
+KRB4_LIB = @KRB4_LIB@
KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
@@ -43,7 +43,7 @@ OBJS= authenc.o commands.o main.o network.o ring.o sys_bsd.o \
all:: telnet
telnet: $(OBJS) $(DEPKLIB) ../libtelnet/libtelnet.a
- $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(K4LIB) $(LIBS)
+ $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(KRB4_LIB) $(LIBS)
clean::
$(RM) telnet
diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in
index a045a0b71d..2f2c5eab89 100644
--- a/src/appl/telnet/telnet/configure.in
+++ b/src/appl/telnet/telnet/configure.in
@@ -33,9 +33,4 @@ AC_CHECK_LIB(ndbm,main)
AC_CHECK_LIB(dbm,main)
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)
V5_AC_OUTPUT_MAKEFILE