+++ configure.orig	2012-03-11 08:02:30.000000000 +0000
--- configure	2012-05-31 12:47:22.000000000 +0100
@@ -4420,7 +4420,7 @@
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LDAP_H 1
 _ACEOF
- LDAPLIB="-lldap"
+ LDAPLIB="-lldap_r"
 else
   LDAPLIB="failed"
 fi
@@ -4443,7 +4443,7 @@
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LDAP_H 1
 _ACEOF
- LDAPLIB="-L$TEST_PATH -lldap"
+ LDAPLIB="-L$TEST_PATH -lldap_r"
 else
   LDAPLIB="failed"
 fi
@@ -4489,7 +4489,7 @@
   return 0;
 }
 _ACEOF
-for ac_lib in '' ldap; do
+for ac_lib in '' ldap_r; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else