diff options
| author | ume <ume@FreeBSD.org> | 2015-08-27 15:03:34 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2015-08-27 15:03:34 +0000 |
| commit | b882529705a487f48363294f4a155db2d2df07ad (patch) | |
| tree | 095b104c9b955ccab884ca039bdeb12cf33a100c /kerberos5 | |
| parent | 0c147f0a462550ec2f9d349406c5cdb2b0de59da (diff) | |
| download | FreeBSD-src-b882529705a487f48363294f4a155db2d2df07ad.zip FreeBSD-src-b882529705a487f48363294f4a155db2d2df07ad.tar.gz | |
Make it buildable with WITH_OPENLDAP, again.
MFC after: 1 week
Diffstat (limited to 'kerberos5')
| -rw-r--r-- | kerberos5/Makefile.inc | 3 | ||||
| -rw-r--r-- | kerberos5/lib/libhdb/Makefile | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index 39bac11..c02eafb 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -13,7 +13,8 @@ OPENLDAPBASE?= /usr/local LDAPLDADD= -lldap -llber LDAPDPADD= ${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;} LDAPCFLAGS= -I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1 -LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib +LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -rpath ${OPENLDAPBASE}/lib +LDFLAGS+= ${LDAPLDFLAGS} .endif .if defined(SRCS) diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile index 9134fb5..2c5ffe4 100644 --- a/kerberos5/lib/libhdb/Makefile +++ b/kerberos5/lib/libhdb/Makefile @@ -1,9 +1,10 @@ # $FreeBSD$ LIB= hdb -LDFLAGS= -Wl,--no-undefined +LDFLAGS= -Wl,--no-undefined ${LDAPLDFLAGS} VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map LIBADD= asn1 com_err krb5 roken sqlite3 +LDADD= ${LDAPLDADD} DPADD= ${LDAPDPADD} MAN= HDB.3 hdb_entry_ex.3 |
