Index: stable/11/kerberos5/Makefile.inc
===================================================================
--- stable/11/kerberos5/Makefile.inc	(revision 311727)
+++ stable/11/kerberos5/Makefile.inc	(revision 311728)
@@ -1,50 +1,53 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 NO_LINT=
 
 KRB5DIR=	${.CURDIR}/../../../crypto/heimdal
 
 CFLAGS+=	-DHAVE_CONFIG_H -I${.CURDIR}/../../include
 
 .if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT)
 OPENLDAPBASE?=	/usr/local
 LDAPLDADD=	-lldap -llber
 LDAPDPADD=	${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;}
 LDAPCFLAGS=	-I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1
 LDAPLDFLAGS=	-L${OPENLDAPBASE}/lib -rpath ${OPENLDAPBASE}/lib
 .endif
 
 .if defined(SRCS)
 
 ETSRCS=	\
 	${KRB5DIR}/lib/asn1/asn1_err.et \
 	${KRB5DIR}/lib/hdb/hdb_err.et \
 	${KRB5DIR}/lib/kadm5/kadm5_err.et \
 	${KRB5DIR}/lib/krb5/heim_err.et \
 	${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]} != ""
 .ORDER: ${_ET}.h ${_ET}.c
 ${_ET}.c: .NOMETA
 ${_ET}.h ${_ET}.c: ${ET}
 	compile_et ${.ALLSRC}
 CLEANFILES+=	${_ET}.h ${_ET}.c
 .endif
 .endfor
 .endfor
 
 .endif # defined(SRCS)
 
 ASN1_COMPILE=	asn1_compile
 MAKE_ROKEN=	make-roken
 SLC=		slc
Index: stable/11/kerberos5/lib/Makefile
===================================================================
--- stable/11/kerberos5/lib/Makefile	(revision 311727)
+++ stable/11/kerberos5/lib/Makefile	(revision 311728)
@@ -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>
Index: stable/11
===================================================================
--- stable/11	(revision 311727)
+++ stable/11	(revision 311728)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r311112,311115