KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use MK_OPENLDAP in preference to WITH_OPENLDAP and make it a default

Browse Source 
NO option to match the opt-in nature of the historical nature of this
option.
This commit is contained in:
Warner Losh
2014-04-24 23:17:31 +00:00
parent 1b74d2a4ad
commit f6092768b1
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kerberos5/Makefile.inc
+3 -1
View File
@@ -1,12 +1,14 @@
# $FreeBSD$ # $FreeBSD$
.include <bsd.own.mk>
NO_LINT= NO_LINT=
KRB5DIR= ${.CURDIR}/../../../crypto/heimdal KRB5DIR= ${.CURDIR}/../../../crypto/heimdal
CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../include CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../include
.if defined(WITH_OPENLDAP) && !defined(COMPAT_32BIT) .if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT)
OPENLDAPBASE?= /usr/local OPENLDAPBASE?= /usr/local
LDAPLDADD= -lldap -llber LDAPLDADD= -lldap -llber
LDAPDPADD= ${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;} LDAPDPADD= ${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;}
share/mk/bsd.opts.mk
+1
View File
@@ -182,6 +182,7 @@ __DEFAULT_NO_OPTIONS = \
LLDB \ LLDB \
NAND \ NAND \
OFED \ OFED \
OPENLDAP \
OPENSSH_NONE_CIPHER \ OPENSSH_NONE_CIPHER \
SHARED_TOOLCHAIN \ SHARED_TOOLCHAIN \
SORT_THREADS \ SORT_THREADS \
tools/build/options/WITH_OPENLDAP
+2
View File
@@ -0,0 +1,2 @@
.\" $FreeBSD$
Enable building openldap support for kerberos.