diff options
author | Mark Eichin <eichin@mit.edu> | 1995-04-27 19:24:53 +0000 |
---|---|---|
committer | Mark Eichin <eichin@mit.edu> | 1995-04-27 19:24:53 +0000 |
commit | 749dab9f4648698ff86bcb42dba36289fb75e207 (patch) | |
tree | 1c97fbbbec4a097d852afd6d3a20546a11790de3 /src | |
parent | 1f9744ea1401b1fc82e257c059f6ffa9579aa1e9 (diff) | |
download | krb5-749dab9f4648698ff86bcb42dba36289fb75e207.tar.gz krb5-749dab9f4648698ff86bcb42dba36289fb75e207.tar.xz krb5-749dab9f4648698ff86bcb42dba36289fb75e207.zip |
* 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
Diffstat (limited to 'src')
-rw-r--r-- | src/appl/telnet/telnetd/ChangeLog | 5 | ||||
-rw-r--r-- | src/appl/telnet/telnetd/Makefile.in | 4 | ||||
-rw-r--r-- | src/appl/telnet/telnetd/configure.in | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog index daf0377305..7264084817 100644 --- 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 866d0cde9c..347765b51f 100644 --- 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 7297914e9f..d295157f2d 100644 --- 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) |