From owner-svn-src-head@FreeBSD.ORG  Thu Apr 24 23:17:32 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A4843AE0;
 Thu, 24 Apr 2014 23:17:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 910101C66;
 Thu, 24 Apr 2014 23:17:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3ONHW69092579;
 Thu, 24 Apr 2014 23:17:32 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3ONHW1o092576;
 Thu, 24 Apr 2014 23:17:32 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201404242317.s3ONHW1o092576@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 24 Apr 2014 23:17:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264902 - in head: kerberos5 share/mk tools/build/options
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2014 23:17:32 -0000

Author: imp
Date: Thu Apr 24 23:17:31 2014
New Revision: 264902
URL: http://svnweb.freebsd.org/changeset/base/264902

Log:
  Use MK_OPENLDAP in preference to WITH_OPENLDAP and make it a default
  NO option to match the opt-in nature of the historical nature of this
  option.

Added:
  head/tools/build/options/WITH_OPENLDAP   (contents, props changed)
Modified:
  head/kerberos5/Makefile.inc
  head/share/mk/bsd.opts.mk

Modified: head/kerberos5/Makefile.inc
==============================================================================
--- head/kerberos5/Makefile.inc	Thu Apr 24 23:12:40 2014	(r264901)
+++ head/kerberos5/Makefile.inc	Thu Apr 24 23:17:31 2014	(r264902)
@@ -1,12 +1,14 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 NO_LINT=
 
 KRB5DIR=	${.CURDIR}/../../../crypto/heimdal
 
 CFLAGS+=	-DHAVE_CONFIG_H -I${.CURDIR}/../../include
 
-.if defined(WITH_OPENLDAP) && !defined(COMPAT_32BIT)
+.if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT)
 OPENLDAPBASE?=	/usr/local
 LDAPLDADD=	-lldap -llber
 LDAPDPADD=	${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;}

Modified: head/share/mk/bsd.opts.mk
==============================================================================
--- head/share/mk/bsd.opts.mk	Thu Apr 24 23:12:40 2014	(r264901)
+++ head/share/mk/bsd.opts.mk	Thu Apr 24 23:17:31 2014	(r264902)
@@ -182,6 +182,7 @@ __DEFAULT_NO_OPTIONS = \
     LLDB \
     NAND \
     OFED \
+    OPENLDAP \
     OPENSSH_NONE_CIPHER \
     SHARED_TOOLCHAIN \
     SORT_THREADS \

Added: head/tools/build/options/WITH_OPENLDAP
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITH_OPENLDAP	Thu Apr 24 23:17:31 2014	(r264902)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Enable building openldap support for kerberos.