summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2017-01-09 01:22:46 +0000
committerngie <ngie@FreeBSD.org>2017-01-09 01:22:46 +0000
commit8c732dceffded7884b31b2a8d4d9b5adc62f5988 (patch)
tree4d2611a0cb1ba31fe75eb715425e39dc48798669
parent1796f20408de26797cc3e6dd5682ebce3e271333 (diff)
downloadFreeBSD-src-8c732dceffded7884b31b2a8d4d9b5adc62f5988.zip
FreeBSD-src-8c732dceffded7884b31b2a8d4d9b5adc62f5988.tar.gz
MFC r311112,r311115:
r311112: libgssapi_{krb5,ntlm,spnego} requires MK_GSSAPI != no; conditionalize their building on the knob r311115: Conditionalize adding ${KRB5DIR}/lib/gssapi/krb5/gkrb5_err.et to ETSRCS if MK_GSSAPI != "no"
-rw-r--r--kerberos5/Makefile.inc5
-rw-r--r--kerberos5/lib/Makefile11
2 files changed, 13 insertions, 3 deletions
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 053522e..4abf68b 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -26,11 +26,14 @@ ETSRCS= \
${KRB5DIR}/lib/krb5/k524_err.et \
${KRB5DIR}/lib/krb5/krb5_err.et \
${KRB5DIR}/lib/krb5/krb_err.et \
- ${KRB5DIR}/lib/gssapi/krb5/gkrb5_err.et \
${KRB5DIR}/lib/hx509/hx509_err.et \
${KRB5DIR}/lib/wind/wind_err.et \
${KRB5DIR}/lib/ntlm/ntlm_err.et
+.if ${MK_GSSAPI} != "no"
+ETSRCS+= ${KRB5DIR}/lib/gssapi/krb5/gkrb5_err.et
+.endif
+
.for ET in ${ETSRCS}
.for _ET in ${ET:T:R}
.if ${SRCS:M${_ET}.[ch]} != ""
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile
index 8d661e0..1f2356d 100644
--- a/kerberos5/lib/Makefile
+++ b/kerberos5/lib/Makefile
@@ -1,11 +1,18 @@
-
# $FreeBSD$
-SUBDIR= libasn1 libgssapi_krb5 libgssapi_ntlm libgssapi_spnego libhdb \
+.include <src.opts.mk>
+
+SUBDIR= libasn1 libhdb \
libheimntlm libhx509 libkadm5clnt libkadm5srv libkrb5 \
libroken libsl libvers libkdc libwind libheimbase libheimipcc libheimipcs
SUBDIR+= libkafs5 # requires krb_err.h from libkrb5
SUBDIR_DEPEND_libkafs5= libkrb5
+.if ${MK_GSSAPI} != "no"
+SUBDIR+= libgssapi_krb5
+SUBDIR+= libgssapi_ntlm
+SUBDIR+= libgssapi_spnego
+.endif
+
.include <bsd.subdir.mk>
OpenPOWER on IntegriCloud