diff options
| author | Shawn Routhier <sar@isc.org> | 2011-02-18 18:44:42 +0000 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2011-02-18 18:44:42 +0000 |
| commit | 2bce58a74344bd782c4cfcd0ae0c1b79f115b7f4 (patch) | |
| tree | c2d4ccd7a2c31ddeb7d6552e05539d8deb269ebd | |
| parent | 9baf6577a57a44b415dbab0045a5f05a2b93e9b6 (diff) | |
| download | isc-dhcp-2bce58a74344bd782c4cfcd0ae0c1b79f115b7f4.tar.gz | |
Some fixes for LDAP
[ISC-Bugs #21783] - Include lber library when building ldap
[ISC-Bugs #22888] - Enable the ldap code when buidling common
| -rw-r--r-- | RELNOTES | 5 | ||||
| -rw-r--r-- | common/Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 8 insertions, 0 deletions
@@ -55,6 +55,11 @@ work on other platforms. Please report any problems and suggested fixes to when removing the ddns information. [ISC-Bugs #23103] +- Some fixes for LDAP + [ISC-Bugs #21783] - Include lber library when building ldap + [ISC-Bugs #22888] - Enable the ldap code when buidling common + The above fixes are from Jiri Popelka at Red Hat. + Changes since 4.2.0 - 'get-host-names true;' now also works even if 'use-host-decl-names true;' diff --git a/common/Makefile.am b/common/Makefile.am index a771df37..e4d4f9c8 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,4 +1,5 @@ AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' +AM_CFLAGS = $(LDAP_CFLAGS) noinst_LIBRARIES = libdhcp.a libdhcp_a_SOURCES = alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c \ diff --git a/configure.ac b/configure.ac index 86458b1e..6418023b 100644 --- a/configure.ac +++ b/configure.ac @@ -523,6 +523,8 @@ AC_ARG_WITH(ldapcrypto, if test x$ldap = xyes || test x$ldapcrypto = xyes ; then AC_SEARCH_LIBS(ldap_initialize, [ldap], , AC_MSG_FAILURE([*** Cannot find ldap_initialize with -lldap - do you need to install an OpenLDAP2 Devel package?])) + AC_SEARCH_LIBS(ber_pvt_opt_on, [lber], , + AC_MSG_FAILURE([*** Cannot find ber_pvt_opt_on with -llber - do you need to install an OpenLDAP2 Devel package?])) if test x$ldapcrypto = xyes ; then AC_SUBST(LDAP_CFLAGS, ["-DLDAP_CONFIGURATION -DLDAP_USE_SSL"]) |