components/cyrus-sasl/patches/110-solaris-configure.patch
changeset 5866 683c5c035a79
equal deleted inserted replaced
5865:3e9949415308 5866:683c5c035a79
       
     1 # Developed in-house at Oracle
       
     2 # File bug 3239 upstream asking for a configure option to give a path or name
       
     3 # for the openldap library.
       
     4 # http://bugzilla.cyrusimap.org/show_bug.cgi?id=3929
       
     5 
       
     6 diff -rupN old/configure.in new/configure.in
       
     7 --- old/configure.in	2016-02-23 19:24:33.185997552 -0800
       
     8 +++ new/configure.in	2016-02-24 10:14:11.001802600 -0800
       
     9 @@ -968,7 +968,7 @@ if test "$ldapdb" != no; then
       
    10          CMU_OPENLDAP_API
       
    11  
       
    12          if test "$cmu_cv_openldap_api" = yes; then
       
    13 -            AC_CHECK_LIB(ldap, ldap_initialize, [ cmu_link_openldap="-lldap -llber" ], [ cmu_link_openldap=no ],-llber)
       
    14 +            AC_CHECK_LIB(ldap_r, ldap_initialize, [ cmu_link_openldap="-lldap_r -llber" ], [ cmu_link_openldap=no ],-llber)
       
    15          fi
       
    16      fi
       
    17  
       
    18 diff -rupN old/saslauthd/configure.in new/saslauthd/configure.in
       
    19 --- old/saslauthd/configure.in	2016-02-23 19:24:48.448493822 -0800
       
    20 +++ new/saslauthd/configure.in	2016-02-24 06:26:13.041626875 -0800
       
    21 @@ -138,8 +138,8 @@ fi
       
    22  
       
    23  LDAP_LIBS=""
       
    24  if test "$with_ldap" != no; then
       
    25 -  AC_CHECK_LIB(ldap, ldap_initialize, [ AC_DEFINE(HAVE_LDAP,[],[Support for LDAP?])
       
    26 -                                        LDAP_LIBS="-lldap -llber"
       
    27 +  AC_CHECK_LIB(ldap_r, ldap_initialize, [ AC_DEFINE(HAVE_LDAP,[],[Support for LDAP?])
       
    28 +                                        LDAP_LIBS="-lldap_r -llber"
       
    29  					if test "$with_openssl" != "no"; then
       
    30  					    LDAP_LIBS="$LDAP_LIBS -lcrypto $LIB_RSAREF"
       
    31  					fi],,-llber)