From 18d8718070b989bd990856066b78524de0c517d7 Mon Sep 17 00:00:00 2001
From: markm <markm@FreeBSD.org>
Date: Fri, 3 Aug 2001 16:03:26 +0000
Subject: Revamp and diff-reduce the various secure telnets. Make sure that
 Kerberos5 has _a_ telnet (which is not currently K5 enabled). Incorporate
 BDE's static linking fixes.

---
 kerberos5/usr.bin/Makefile        |  2 +-
 kerberos5/usr.bin/telnet/Makefile | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'kerberos5/usr.bin')

diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
index b218829..60f05e5 100644
--- a/kerberos5/usr.bin/Makefile
+++ b/kerberos5/usr.bin/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	k5admin k5destroy k5init k5list k5passwd k5su
+SUBDIR=	k5admin k5destroy k5init k5list k5passwd k5su telnet
 
 .include <bsd.subdir.mk>
diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile
index 7d331f7..b2755c8 100644
--- a/kerberos5/usr.bin/telnet/Makefile
+++ b/kerberos5/usr.bin/telnet/Makefile
@@ -2,17 +2,18 @@
 
 PROG=		telnet
 
-CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
-		-DENCRYPTION -DAUTHENTICATION -DKRB4 \
-		-I${TELNETDIR} -DIPSEC -DINET6
+CFLAGS=		-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
+		-DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \
+		-I${TELNETDIR}
+#CFLAGS+=	-DKRB5
 
 SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
 		telnet.c terminal.c tn3270.c utilities.c
 
-DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} ${LIBCRYPT} \
-		${LIBCOM_ERR} ${LIBIPSEC} ${LIBPAM}
-LDADD=		-ltermcap ${LIBTELNET} -lcrypto \
-		-L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp -lipsec ${MINUSLPAM}
+DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} \
+		${LIBIPSEC} ${LIBPAM}
+LDADD=		-ltermcap ${LIBTELNET} -lmp -lcrypto -lcrypt \
+		-lipsec ${MINUSLPAM}
 
 .include <bsd.prog.mk>
 
-- 
cgit v1.1