summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/cvs
diff options
context:
space:
mode:
authornectar <nectar@FreeBSD.org>2003-05-05 16:50:42 +0000
committernectar <nectar@FreeBSD.org>2003-05-05 16:50:42 +0000
commit77b1a36816e3f349d2e695df839459ac1905b0ab (patch)
tree696b79c16c53d04122232b373d4d8313b2a79dc4 /gnu/usr.bin/cvs
parent4d2e2437c20e62618ad0958e7ab0502c29c759e0 (diff)
downloadFreeBSD-src-77b1a36816e3f349d2e695df839459ac1905b0ab.zip
FreeBSD-src-77b1a36816e3f349d2e695df839459ac1905b0ab.tar.gz
Enable GSSAPI/Kerberos 5 support (aka `gserver').
MFC after: 1 month
Diffstat (limited to 'gnu/usr.bin/cvs')
-rw-r--r--gnu/usr.bin/cvs/cvs/Makefile15
1 files changed, 6 insertions, 9 deletions
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index c75bf82..ce71f92 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -30,15 +30,12 @@ CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H \
DPADD+= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
LDADD+= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
-.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
-CFLAGS+=-DHAVE_KERBEROS -DHAVE_KRB_GET_ERR_TEXT
-LDADD+= -lkrb -lcrypto -lcom_err
-DPADD+= ${LIBKRB} ${LIBCRYPTO} ${LIBCOM_ERR}
-DISTRIBUTION= krb4
-# XXX do we want to mess with this? It's probably not really worth it for
-# the public freebsd stuff, but others might want it. It's an optional
-# feature anyway, the -x switch is needed to activate it.
-CFLAGS+= -DENCRYPTION
+.if !defined(NO_KERBEROS) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
+CFLAGS+= -DHAVE_GSSAPI -DHAVE_GSSAPI_H -DENCRYPTION
+LDADD+= -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lcom_err
+DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN}
+DPADD+= ${LIBCRYPT} ${LIBCOM_ERR}
+DISTRIBUTION= crypto
.endif
#
OpenPOWER on IntegriCloud