First level of changes for bringing in eBones (kerberos).

- Get rid of inverse logic (NOKERBEROS and NOEBONES) in src/makefile,
and replace with MAKE_KERBEROS and MAKE_EBONES.  (Far fewer contortions,
and both default to off.)  IF YOU WANT KERBEROS, YOU HAVE TO EXPLICITLY
DEFINE ONE OF THESE.
- Make Makefiles kerberos-aware.

5 files changed, 52 insertions, 21 deletions

diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 3a5cd33..bae657d 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,18 +1,24 @@
-#	@(#)Makefile	8.1 (Berkeley) 7/19/93
+# From:	@(#)Makefile	8.1 (Berkeley) 7/19/93
+# $Id$
 
-#CFLAGS+=-DKERBEROS
 PROG=	login
 MAN1=	login.1
 MAN5=	login.access.5
 SRCS=	login.c login_access.c login_skey.c login_fbtab.c
-#klogin.c
 DPADD=	${LIBUTIL} ${LIBSKEY}
-#${LIBKRB} ${LIBDES}
 LDADD=	-lutil -lcrypt -lskey
-#-lkrb -ldes
+CFLAGS+=-DLOGIN_ACCESS -DSKEY -DLOGALL
+
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \
+	|| defined(MAKE_EBONES))
+CFLAGS+=-DKERBEROS
+SRCS+=	klogin.c
+DPADD+=	${LIBKRB} ${LIBDES}
+LDADD+=	-lkrb -ldes
+.endif
+
 BINOWN=	root
 BINMODE=4555
-CFLAGS+=	-DLOGIN_ACCESS -DSKEY -DLOGALL
 INSTALLFLAGS=-fschg
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 1614ba4..f502361 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,15 +1,24 @@
-#	@(#)Makefile	8.3 (Berkeley) 4/2/94
+# From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
+# $Id$
 
 PROG=	passwd
 SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c
 LDADD=	-lcrypt
-#krb_passwd.c
-#DPADD=	${LIBKRB} ${LIBDES}
 .PATH:  ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
 	${.CURDIR}/../rlogin
 CFLAGS+=-DCRYPT -I${.CURDIR} -I${.CURDIR}/../../usr.sbin/vipw \
 	-I${.CURDIR}/../../usr.bin/chpass
-#LDADD+=-lkrb -ldes
+
+
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \
+	|| defined(MAKE_EBONES))
+SRCS+=	krb_passwd.c
+CFLAGS+=-DKERBEROS
+LDADD+=-lkrb -ldes
+DPADD=	${LIBKRB} ${LIBDES}
+.endif
+
+
 BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index 4eacdee..134885d 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -2,10 +2,15 @@
 
 PROG=	rlogin
 SRCS=	rlogin.c
-#krcmd.c kcmd.c 
-#DPADD=	${LIBKRB} ${LIBDES}
-#CFLAGS+=-DKERBEROS -DCRYPT
-#LDADD=	-lkrb -ldes
+
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \
+	|| defined(MAKE_EBONES))
+SRCS+=	krcmd.c kcmd.c 
+DPADD=	${LIBKRB} ${LIBDES}
+CFLAGS+=-DKERBEROS -DCRYPT
+LDADD=	-lkrb -ldes
+.endif
+
 BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index 660323a..470d7b6 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -1,11 +1,16 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 
 PROG=	rsh
-#CFLAGS+=-DKERBEROS -DCRYPT
 SRCS=	rsh.c
-#krcmd.c kcmd.c des_rw.c
-#DPADD=	${LIBKRB} ${LIBDES}
-#LDADD=	-lkrb -ldes
+
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \
+	|| defined(MAKE_EBONES))
+CFLAGS+=-DKERBEROS -DCRYPT
+SRCS+=	krcmd.c kcmd.c
+DPADD=	${LIBKRB} ${LIBDES}
+LDADD=	-lkrb -ldes
+.endif
+
 BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index 33dc062..4eeb2f6 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -2,9 +2,15 @@
 
 PROG=	su
 LDADD=	-lcrypt
-#CFLAGS+=-DKERBEROS
-#DPADD=	${LIBKRB} ${LIBDES}
-#LDADD+=-lkrb -ldes
+DPADD=	${LIBCRYPT}
+
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \
+	|| defined(MAKE_EBONES))
+CFLAGS+=-DKERBEROS
+DPADD+=	${LIBKRB} ${LIBDES}
+LDADD+=	-lkrb -ldes
+.endif
+
 BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg