svn commit: r311728 - in stable/11/kerberos5: . lib

[Ngie Cooper]

Author: ngie
Date: Mon Jan  9 01:22:46 2017
New Revision: 311728
URL: https://svnweb.freebsd.org/changeset/base/311728

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/11/kerberos5/Makefile.inc
  stable/11/kerberos5/lib/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/kerberos5/Makefile.inc
==============================================================================
--- stable/11/kerberos5/Makefile.inc	Mon Jan  9 01:15:18 2017	(r311727)
+++ stable/11/kerberos5/Makefile.inc	Mon Jan  9 01:22:46 2017	(r311728)
@@ -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]} != ""

Modified: stable/11/kerberos5/lib/Makefile
==============================================================================
--- stable/11/kerberos5/lib/Makefile	Mon Jan  9 01:15:18 2017	(r311727)
+++ stable/11/kerberos5/lib/Makefile	Mon Jan  9 01:22:46 2017	(r311728)
@@ -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>