* Makefile.in (telnetd): use KRB4_LIB directly.

	* configure.in: use WITH_KRB4 as-is.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5561 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index daf037730569df4ecdf62a6198512e77c0351f22..72640848178cbbe6bd4291cf956622d2ef4f8e77 100644 (file)
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 27 13:57:03 1995  Mark Eichin  <eichin@cygnus.com>
+
+       * Makefile.in (telnetd): use KRB4_LIB directly.
+       * configure.in: use WITH_KRB4 as-is.
+
 Wed Apr 25 22:53:20 1995  Chris Provenzano  (proven@mit.edu)
 
         * configure.in, sys_term.c, telnetd.c : Have configure check for

diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in
index 866d0cde9ce6b7375f34877a17562f44bddb1d0a..347765b51f05f82566bddfe36435fc744198f6a7 100644 (file)
--- a/src/appl/telnet/telnetd/Makefile.in
+++ b/src/appl/telnet/telnetd/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)
 
@@ -52,7 +52,7 @@ OBJS= telnetd.o \
 all:: telnetd
 
 telnetd: $(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) telnetd

diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in
index 7297914e9f40ef1e914240885f9aee802e3e18f6..d295157f2d50860127a27bb11c10d9ab071988ee 100644 (file)
--- a/src/appl/telnet/telnetd/configure.in
+++ b/src/appl/telnet/telnetd/configure.in
@@ -6,11 +6,6 @@ AC_SET_BUILDTOP
 AC_PROG_INSTALL
 KRB_INCLUDE
 WITH_KRB4
-AC_ARG_WITH([krb4],,dnl
-ADD_DEF(-DKRB4)
-K4LIB='$(KRB4)/lib/libkrb.a $(KRB4)/lib/libdes.a',
-K4LIB=)
-AC_SUBST(K4LIB)
 WITH_NETLIB
 AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)