|
1 # |
|
2 # Temporary fix, to use OpenLDAP library, instead of legacy Mozilla LDAP |
|
3 # Hardcodes -lldap_r-2.4 in configure script, instead of -lldap. |
|
4 # Necessary to build current krb5, otherwise: |
|
5 # kdb_ldap_conn.c, line 142: undefined symbol: LDAP_SASL_QUIET |
|
6 # |
|
7 # Reported upstream: |
|
8 # http://krbdev.mit.edu/rt/Ticket/Display.html?id=8261 |
|
9 # Patch source: in-house |
|
10 # |
|
11 diff -ur old/src/configure.in new/src/configure.in |
|
12 --- old/src/configure.in 2013-11-04 16:55:08.000000000 -0800 |
|
13 +++ new/src/configure.in 2014-05-22 04:28:42.013736461 -0700 |
|
14 @@ -1118,20 +1118,20 @@ |
|
15 ldap_lib="" |
|
16 if test -n "$OPENLDAP_PLUGIN"; then |
|
17 AC_CHECK_HEADERS(ldap.h lber.h, :, [AC_MSG_ERROR($ac_header not found)]) |
|
18 - AC_CHECK_LIB(ldap, ldap_init, :, [AC_MSG_ERROR(libldap not found or missing ldap_init)]) |
|
19 + AC_CHECK_LIB(ldap_r-2.4, ldap_init, :, [AC_MSG_ERROR(libldap not found or missing ldap_init)]) |
|
20 old_LIBS="$LIBS" |
|
21 - LIBS="$LIBS -lldap" |
|
22 + LIBS="$LIBS -lldap_r-2.4" |
|
23 AC_CHECK_FUNCS(ldap_initialize ldap_url_parse_nodn ldap_unbind_ext_s ldap_str2dn ldap_explode_dn) |
|
24 LIBS="$old_LIBS" |
|
25 |
|
26 BER_OKAY=0 |
|
27 - AC_CHECK_LIB(ldap, ber_init, [BER_OKAY=1]) |
|
28 + AC_CHECK_LIB(ldap_r-2.4, ber_init, [BER_OKAY=1]) |
|
29 if test "$BER_OKAY" = "1"; then |
|
30 - LDAP_LIBS='-lldap' |
|
31 + LDAP_LIBS='-lldap_r-2.4' |
|
32 else |
|
33 - AC_CHECK_LIB(lber, ber_init, [BER_OKAY=1], [AC_MSG_WARN([libber not found])]) |
|
34 + AC_CHECK_LIB(lber-2.4, ber_init, [BER_OKAY=1], [AC_MSG_WARN([libber not found])]) |
|
35 if test "$BER_OKAY" = "1"; then |
|
36 - LDAP_LIBS='-lldap -llber' |
|
37 + LDAP_LIBS='-lldap_r-2.4 -llber-2.4' |
|
38 else |
|
39 AC_ERROR("BER library missing - cannot build LDAP database module") |
|
40 fi |