Author: ngie
Date: Mon Jan 9 01:29:20 2017
New Revision: 311729
URL: https://svnweb.freebsd.org/changeset/base/311729
Log:
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"
Modified:
stable/10/kerberos5/Makefile.inc
stable/10/kerberos5/lib/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/kerberos5/Makefile.inc
==============================================================================
--- stable/10/kerberos5/Makefile.inc Mon Jan 9 01:22:46 2017
(r311728)
+++ stable/10/kerberos5/Makefile.inc Mon Jan 9 01:29:20 2017
(r311729)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
NO_LINT=
KRB5DIR= ${.CURDIR}/../../../crypto/heimdal
@@ -27,11 +29,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]} != ""
Modified: stable/10/kerberos5/lib/Makefile
==============================================================================
--- stable/10/kerberos5/lib/Makefile Mon Jan 9 01:22:46 2017
(r311728)
+++ stable/10/kerberos5/lib/Makefile Mon Jan 9 01:29:20 2017
(r311729)
@@ -1,10 +1,17 @@
-
# $FreeBSD$
-SUBDIR= libasn1 libgssapi_krb5 libgssapi_ntlm libgssapi_spnego libhdb \
+.include <bsd.own.mk>
+
+SUBDIR= libasn1 libhdb \
libheimntlm libhx509 libkadm5clnt libkadm5srv libkafs5 libkrb5 \
libroken libsl libvers libkdc libwind libheimsqlite libheimbase
libheimipcc libheimipcs
SUBDIR_DEPEND_libkafs5= libkrb5
+.if ${MK_GSSAPI} != "no"
+SUBDIR+= libgssapi_krb5
+SUBDIR+= libgssapi_ntlm
+SUBDIR+= libgssapi_spnego
+.endif
+
.include <bsd.subdir.mk>
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
