WLDAP32: link to the reentrant version of libldap

Robert Reif reif at earthlink.net
Tue Dec 13 18:56:13 CST 2005


Hans Leidekker wrote:

>The configure check somehow needs -lpthread on Fedora based systems but
>Wine's build system links wldap32 to libldap_r without it just fine.
>
>Adding -lphtread to the configure check doesn't seem to cause any trouble
>on my Debian based Ubuntu either (where it isn't needed). I suspect it's
>a problem with the (newer) autoconf tools in Fedora.
>
> -Hans
>
>Changelog
>  Link to the reentrant version of libldap.
>  
>
>------------------------------------------------------------------------
>
>f891a05d34c03c99b3476dea041cca3f9e06cc09
>diff --git a/configure.ac b/configure.ac
>index a834d40..4b9a0f2 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -542,15 +542,20 @@ then
> fi
> 
> dnl **** Check for OpenLDAP ***
>+saved_libs="$LIBS"
>+LIBS="$LIBS $LIBPTHREAD"
>+
> AC_SUBST(LDAPLIBS,"")
> if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes"
> then
>-    AC_CHECK_LIB(ldap, ldap_initialize,
>+    AC_CHECK_LIB(ldap_r, ldap_initialize,
>         [AC_CHECK_LIB(lber, ber_init,
>             [AC_DEFINE(HAVE_LDAP, 1, [Define if you have the OpenLDAP development environment])
>-             LDAPLIBS="-lldap -llber"])])
>+             LDAPLIBS="-lldap_r -llber"])])
> fi
> 
>+LIBS="$saved_libs"
>+
> dnl **** Check for FreeType 2 ****
> AC_SUBST(FREETYPELIBS,"")
> AC_SUBST(FREETYPEINCL,"")
>  
>
>------------------------------------------------------------------------
>
>  
>
This patch breaks builds on RH9 and appears to be responsible for the 
build breakage on http://www.astro.gla.ac.uk/users/paulm/WRT/wrt.php




More information about the wine-devel mailing list