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.

10 files changed, 110 insertions, 54 deletions

diff --git a/Makefile b/Makefile
index f50beba..28f1259 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,26 @@
 #
-#	$Id: Makefile,v 1.20 1994/09/23 08:36:37 rgrimes Exp $
+#	$Id: Makefile,v 1.21 1994/09/23 09:00:35 rgrimes Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include and MOST of /usr/lib 
 #	-DMAKE_LOCAL to add ./local to the SUBDIR list
 #	-DMAKE_PORTS to add ./ports to the SUBDIR list
+# XXX1	-DMAKE_KERBEROS to build KerberosIV
+#	-DMAKE_EBONES to build eBones (KerberosIV)
+#
 #	-DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
 #	-DNOCRYPT will prevent building of crypt versions
-# XXX2	-DNOKERBEROS do not build Kerberos
 #	-DNOLKM do not build loadable kernel modules
 #	-DNOOBJDIR do not run ``${MAKE} obj''
 #	-DNOPROFILE do not build profiled libraries
 #	-DNOSECURE do not go into secure subdir
-#	-DNOEBONES do not make eBones (kerberosIV)
 #
-# XXX2	Mandatory, and Kerberos will not build sucessfully yet
+#
+# XXX1	The kerberos IV off the 4.4-Lite tape (src/kerberosIV)
+#	will not build successfully yet.  MAKE_KERBEROS should not be
+#	defined.
 
 # Put initial settings here.
-NOKERBEROS=	yes
 SUBDIR=
 
 .if exists(bin)
@@ -42,11 +45,10 @@ SUBDIR+= include
 .if exists(lib)
 SUBDIR+= lib
 .endif
-.if exists(kerberosIV) && !defined(NOCRYPT) && !defined(NOKERBEROS)
+.if exists(kerberosIV) && !defined(NOCRYPT) && defined(MAKE_KERBEROS)
 SUBDIR+= kerberosIV
 .endif
-.if exists(eBones) && !defined(NOCRYPT) && defined(NOKERBEROS) \
-			&& !defined(NOEBONES)
+.if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
 SUBDIR+= eBones
 .endif
 .if exists(libexec)
@@ -170,18 +172,17 @@ includes:
 	cd ${.CURDIR}/include &&		${MAKE} install
 	cd ${.CURDIR}/gnu/lib/libreadline &&	${MAKE} beforeinstall
 	cd ${.CURDIR}/gnu/lib/libg++ &&         ${MAKE} beforeinstall
-.if exists(kerberosIV) && !defined(NOCRYPT) && !defined(NOKERBEROS)
+.if exists(kerberosIV) && !defined(NOCRYPT) && defined(MAKE_KERBEROS)
 	cd ${.CURDIR}/kerberosIV/include &&	${MAKE} install
 .endif
+.if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
+	cd ${.CURDIR}/eBones/include &&		${MAKE} beforeinstall
+.endif
 	cd ${.CURDIR}/lib/libc &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libcurses &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libedit &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libmd &&		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/librpcsvc &&		${MAKE} beforeinstall
-.if exists(eBones) && !defined(NOCRYPT) && defined(NOKERBEROS) && \
-			!defined(NOEBONES)
-	cd ${.CURDIR}/eBones/include &&		${MAKE} beforeinstall
-.endif
 
 libraries:
 	@echo "--------------------------------------------------------------"
@@ -206,7 +207,7 @@ libraries:
 .endif
 	cd ${.CURDIR}/usr.bin/lex/lib && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
-.if exists(kerberosIV) && !defined(NOCRYPT) && !defined(NOKERBEROS)
+.if exists(kerberosIV) && !defined(NOCRYPT) && defined(MAKE_KERBEROS)
 	cd ${.CURDIR}/kerberosIV/acl && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 	cd ${.CURDIR}/kerberosIV/des && \
@@ -216,8 +217,7 @@ libraries:
 	cd ${.CURDIR}/kerberosIV/krb && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 .endif
-.if exists(eBones) && !defined(NOCRYPT) && defined(NOKERBEROS) && \
-			!defined(NOEBONES)
+.if exists(eBones) && !defined(NOCRYPT) && defined(MAKE_EBONES)
 	cd ${.CURDIR}/eBones/des && \
 		${MAKE} depend all install ${CLEANDIR} ${OBJDIR}
 	cd ${.CURDIR}/eBones/acl && \
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index ff9840c..08658fc 100644
--- a/bin/rcp/Makefile
+++ b/bin/rcp/Makefile
@@ -1,14 +1,22 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id$
+#	$Id: Makefile,v 1.3 1994/09/24 02:56:53 davidg Exp $
 
 PROG=	rcp
-SRCS=	rcp.c util.c #kcmd.c krcmd.c
-#CFLAGS+=-DKERBEROS -DCRYPT
-#DPADD=	${LIBKRB} ${LIBDES}
-#LDADD=	-lkrb -ldes
+SRCS=	rcp.c util.c
+
+
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS)	\
+	|| defined(MAKE_EBONES))
+SRCS+=	kcmd.c krcmd.c
+CFLAGS+=-DKERBEROS -DCRYPT
+DPADD=	${LIBKRB} ${LIBDES}
+LDADD=	-lkrb -ldes
+.endif
+
 BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg
+
 .PATH:	${.CURDIR}/../../usr.bin/rlogin
 
 .include <bsd.prog.mk>
diff --git a/libexec/kpasswdd/Makefile b/libexec/kpasswdd/Makefile
index b7e6032..213e83a 100644
--- a/libexec/kpasswdd/Makefile
+++ b/libexec/kpasswdd/Makefile
@@ -1,11 +1,19 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
+#
+# We do still make this one conditional on kerberos, in case 
+# the libraries do not exist
+
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \
+	|| defined(MAKE_EBONES))
 
 PROG=	kpasswdd
-SRCS=	kpasswdd.c des_rw.c
+SRCS=	kpasswdd.c
 CFLAGS+=-DCRYPT -DKERBEROS -I${.CURDIR}/../../usr.bin/passwd
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
 LDADD=	-lkdb -lkrb -ldes
 .PATH:	${.CURDIR}/../../usr.bin/rlogin
 MAN8=	kpasswdd.8
 
+.endif
+
 .include <bsd.prog.mk>
diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile
index 7cc189a..c3eb695 100644
--- a/libexec/rlogind/Makefile
+++ b/libexec/rlogind/Makefile
@@ -1,11 +1,16 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
 PROG=	rlogind
-#CFLAGS+=-DKERBEROS -DCRYPT
-SRCS=	rlogind.c #des_rw.c
+SRCS=	rlogind.c
 MAN8=	rlogind.8
-DPADD=	${LIBUTIL} #${LIBKRB} ${LIBDES}
-LDADD=	-lutil #-lkrb -ldes
-.PATH: ${.CURDIR}/../../usr.bin/rlogin
+DPADD=	${LIBUTIL}
+LDADD=	-lutil
+
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \
+	|| defined(MAKE_EBONES))
+CFLAGS+=-DKERBEROS -DCRYPT
+DPADD=	${LIBKRB} ${LIBDES}
+LDADD+=	-lkrb -ldes
+.endif
 
 .include <bsd.prog.mk>
diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile
index 47b80f2..ddf08e1 100644
--- a/libexec/rshd/Makefile
+++ b/libexec/rshd/Makefile
@@ -1,11 +1,15 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/4/93
+# From:	@(#)Makefile	8.1 (Berkeley) 6/4/93
+# $Id$
 
 PROG=	rshd
-#CFLAGS+=-DKERBEROS -DCRYPT
-SRCS=	rshd.c #des_rw.c
+SRCS=	rshd.c
 MAN8=	rshd.8
-#DPADD=	${LIBKRB} ${LIBDES}
-#LDADD=	-lkrb -ldes
-.PATH: ${.CURDIR}/../../usr.bin/rlogin
+
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \
+	|| defined(MAKE_EBONES))
+CFLAGS+=-DKERBEROS -DCRYPT
+DPADD=	${LIBKRB} ${LIBDES}
+LDADD=	-lkrb -ldes
+.endif
 
 .include <bsd.prog.mk>
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