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.

3 files changed, 29 insertions, 12 deletions

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>