Date: Thu, 24 Apr 2014 23:17:32 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> 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 Message-ID: <201404242317.s3ONHW1o092576@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404242317.s3ONHW1o092576>