| author | Jan Parcel <jan.parcel@oracle.com> |
| Wed, 27 Apr 2016 16:55:22 -0700 | |
| changeset 5866 | 683c5c035a79 |
| permissions | -rw-r--r-- |
|
5866
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
1 |
# Developed in-house at Oracle |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
2 |
# File bug 3239 upstream asking for a configure option to give a path or name |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
3 |
# for the openldap library. |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
4 |
# http://bugzilla.cyrusimap.org/show_bug.cgi?id=3929 |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
5 |
|
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
6 |
diff -rupN old/configure.in new/configure.in |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
7 |
--- old/configure.in 2016-02-23 19:24:33.185997552 -0800 |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
8 |
+++ new/configure.in 2016-02-24 10:14:11.001802600 -0800 |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
9 |
@@ -968,7 +968,7 @@ if test "$ldapdb" != no; then |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
10 |
CMU_OPENLDAP_API |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
11 |
|
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
12 |
if test "$cmu_cv_openldap_api" = yes; then |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
13 |
- AC_CHECK_LIB(ldap, ldap_initialize, [ cmu_link_openldap="-lldap -llber" ], [ cmu_link_openldap=no ],-llber) |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
14 |
+ AC_CHECK_LIB(ldap_r, ldap_initialize, [ cmu_link_openldap="-lldap_r -llber" ], [ cmu_link_openldap=no ],-llber) |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
15 |
fi |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
16 |
fi |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
17 |
|
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
18 |
diff -rupN old/saslauthd/configure.in new/saslauthd/configure.in |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
19 |
--- old/saslauthd/configure.in 2016-02-23 19:24:48.448493822 -0800 |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
20 |
+++ new/saslauthd/configure.in 2016-02-24 06:26:13.041626875 -0800 |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
21 |
@@ -138,8 +138,8 @@ fi |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
22 |
|
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
23 |
LDAP_LIBS="" |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
24 |
if test "$with_ldap" != no; then |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
25 |
- AC_CHECK_LIB(ldap, ldap_initialize, [ AC_DEFINE(HAVE_LDAP,[],[Support for LDAP?]) |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
26 |
- LDAP_LIBS="-lldap -llber" |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
27 |
+ AC_CHECK_LIB(ldap_r, ldap_initialize, [ AC_DEFINE(HAVE_LDAP,[],[Support for LDAP?]) |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
28 |
+ LDAP_LIBS="-lldap_r -llber" |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
29 |
if test "$with_openssl" != "no"; then |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
30 |
LDAP_LIBS="$LDAP_LIBS -lcrypto $LIB_RSAREF" |
|
683c5c035a79
23116175 Get the cyrus-sasl component ready for MIT-default Kerberos
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
31 |
fi],,-llber) |