diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2015-08-27 15:03:34 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2015-08-27 15:03:34 +0000 |
| commit | 34d2e76a64e5b56624b3004c94550f60179f26e6 (patch) | |
| tree | 095b104c9b955ccab884ca039bdeb12cf33a100c /kerberos5 | |
| parent | 2c51488ec863c98ce5d72c79cc1fd1cb6bb70054 (diff) | |
| download | src-test2-34d2e76a64e5b56624b3004c94550f60179f26e6.tar.gz src-test2-34d2e76a64e5b56624b3004c94550f60179f26e6.zip | |
Make it buildable with WITH_OPENLDAP, again.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=287208
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 39bac1166cea..c02eafb000b6 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 9134fb5180a6..2c5ffe45111d 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 |