diff options
| author | Greg Hudson <ghudson@mit.edu> | 2016-11-22 02:17:38 -0500 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2016-11-23 19:26:52 -0500 |
| commit | 1d2ba62150f02751c58ccd3ab011c793be04a144 (patch) | |
| tree | d076e81a915b6aedd23709c14847ee8b1279f168 /src/configure.in | |
| parent | 6ee24f97b98f9c045632b1ce0670a3eb508cb833 (diff) | |
| download | krb5-1d2ba62150f02751c58ccd3ab011c793be04a144.zip krb5-1d2ba62150f02751c58ccd3ab011c793be04a144.tar.gz krb5-1d2ba62150f02751c58ccd3ab011c793be04a144.tar.bz2 | |
Simplify LDAP module by relying on OpenLDAP 2.1
Solaris 11 provides an OpenLDAP library (which we don't auto-detect,
but should) in addition to the old Mozilla LDAP library; this will
become the default LDAP library in the next release. As there is no
longer a need to build against the Mozilla LDAP library, and as we
have unwittingly relied on some OpenLDAP-specific features since 1.13,
remove the compatibility code for the Mozilla LDAP library and just
require OpenLDAP 2.1 (which added ldap_str2dn).
Diffstat (limited to 'src/configure.in')
| -rw-r--r-- | src/configure.in | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/configure.in b/src/configure.in index 2c7be74..a519a4f 100644 --- a/src/configure.in +++ b/src/configure.in @@ -1214,11 +1214,7 @@ ldap_plugin_dir="" ldap_lib="" if test -n "$OPENLDAP_PLUGIN"; then AC_CHECK_HEADERS(ldap.h lber.h, :, [AC_MSG_ERROR($ac_header not found)]) - AC_CHECK_LIB(ldap, ldap_init, :, [AC_MSG_ERROR(libldap not found or missing ldap_init)]) - old_LIBS="$LIBS" - LIBS="$LIBS -lldap" - AC_CHECK_FUNCS(ldap_initialize ldap_url_parse_nodn ldap_unbind_ext_s ldap_str2dn ldap_explode_dn) - LIBS="$old_LIBS" + AC_CHECK_LIB(ldap, ldap_str2dn, :, [AC_MSG_ERROR(libldap not found or missing ldap_str2dn)]) BER_OKAY=0 AC_CHECK_LIB(ldap, ber_init, [BER_OKAY=1]) |