From owner-svn-src-stable@freebsd.org Mon Jan 9 01:22:47 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E08CBCA5CC2;
Mon, 9 Jan 2017 01:22:47 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 8B677166E;
Mon, 9 Jan 2017 01:22:47 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v091Mk8I093866;
Mon, 9 Jan 2017 01:22:46 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v091MkPq093864;
Mon, 9 Jan 2017 01:22:46 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201701090122.v091MkPq093864@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Mon, 9 Jan 2017 01:22:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r311728 - in stable/11/kerberos5: . lib
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
<svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jan 2017 01:22:48 -0000
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>