svn commit: r228284 - in head/kerberos5: . lib/libhdb

[Hajimu UMEMOTO]

Author: ume
Date: Mon Dec  5 16:38:52 2011
New Revision: 228284
URL: http://svn.freebsd.org/changeset/base/228284

Log:
  - Make heimdal buildable with WITH_OPENLDAP defined, again.
  - Our heimdal uses the deprecated OpenLDAP functions.

Modified:
  head/kerberos5/Makefile.inc
  head/kerberos5/lib/libhdb/Makefile

Modified: head/kerberos5/Makefile.inc
==============================================================================
--- head/kerberos5/Makefile.inc	Mon Dec  5 16:08:18 2011	(r228283)
+++ head/kerberos5/Makefile.inc	Mon Dec  5 16:38:52 2011	(r228284)
@@ -10,7 +10,7 @@ CFLAGS+=	-DHAVE_CONFIG_H -I${.CURDIR}/..
 OPENLDAPBASE?=	/usr/local
 LDAPLDADD=	-lldap -llber
 LDAPDPADD=	${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;}
-LDAPCFLAGS=	-I${OPENLDAPBASE}/include -DOPENLDAP=1
+LDAPCFLAGS=	-I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1
 LDAPLDFLAGS=	-L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib
 .endif
 

Modified: head/kerberos5/lib/libhdb/Makefile
==============================================================================
--- head/kerberos5/lib/libhdb/Makefile	Mon Dec  5 16:08:18 2011	(r228283)
+++ head/kerberos5/lib/libhdb/Makefile	Mon Dec  5 16:38:52 2011	(r228284)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 LIB=	hdb
-LDFLAGS=	-Wl,--no-undefined
-LDADD=	-lasn1 -lcom_err -lkrb5 -lroken
-DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN}
+LDFLAGS=	-Wl,--no-undefined ${LDAPLDFLAGS}
+LDADD=	-lasn1 -lcom_err -lkrb5 -lroken ${LDAPLDADD}
+DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} ${LDAPDPADD}
 
 INCS=	hdb-private.h \
 	hdb-protos.h \