diff options
| author | ume <ume@FreeBSD.org> | 2011-12-05 16:38:52 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2011-12-05 16:38:52 +0000 |
| commit | 7a41e563a7bad30403d1215e7ca77e39cc5bba64 (patch) | |
| tree | 108d8dd4f78b1792e429a12b1c778d2b21bb29da /kerberos5 | |
| parent | 8005c0f4811963bd578199ad9c110444da2f5dad (diff) | |
| download | FreeBSD-src-7a41e563a7bad30403d1215e7ca77e39cc5bba64.zip FreeBSD-src-7a41e563a7bad30403d1215e7ca77e39cc5bba64.tar.gz | |
- Make heimdal buildable with WITH_OPENLDAP defined, again.
- Our heimdal uses the deprecated OpenLDAP functions.
Diffstat (limited to 'kerberos5')
| -rw-r--r-- | kerberos5/Makefile.inc | 2 | ||||
| -rw-r--r-- | kerberos5/lib/libhdb/Makefile | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index 2330979..ec224f4 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -10,7 +10,7 @@ CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../include 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 diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile index 653690a..0e70799 100644 --- a/kerberos5/lib/libhdb/Makefile +++ b/kerberos5/lib/libhdb/Makefile @@ -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 \ |
