[evolution/webkit] Bug #633948 - Try harder to use -lresolv in LDAP_LIBS

[Dan VrÃtil <dvratil src gnome org>]

commit bbde82f87463f99a2abedf95ccd39746a4d44740
Author: Mathieu Trudel-Lapierre <mathieu canonical com>
Date:   Fri Jun 3 15:12:32 2011 +0200

    Bug #633948 - Try harder to use -lresolv in LDAP_LIBS

 m4/evo_ldap_check.m4    |    2 +-
 m4/evo_sunldap_check.m4 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/m4/evo_ldap_check.m4 b/m4/evo_ldap_check.m4
index a029ac7..bc02511 100644
--- a/m4/evo_ldap_check.m4
+++ b/m4/evo_ldap_check.m4
@@ -55,7 +55,7 @@ AC_DEFUN([EVO_LDAP_CHECK],[
 			AC_MSG_ERROR([evolution requires OpenLDAP version >= 2])
 		fi
 
-		AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"])
+		AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"], [AC_CHECK_LIB(resolv, __res_query, [LDAP_LIBS="-lresolv"])])
 		AC_CHECK_LIB(socket, bind, [LDAP_LIBS="$LDAP_LIBS -lsocket"])
 		AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])
 		AC_CHECK_LIB(lber, ber_get_tag, [
diff --git a/m4/evo_sunldap_check.m4 b/m4/evo_sunldap_check.m4
index bd85534..b52aac3 100644
--- a/m4/evo_sunldap_check.m4
+++ b/m4/evo_sunldap_check.m4
@@ -57,7 +57,7 @@ AC_DEFUN([EVO_SUNLDAP_CHECK], [
 		       AC_MSG_ERROR([evolution requires SunLDAP version >= 2])
 		fi
 
-		AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"])
+		AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"], [AC_CHECK_LIB(resolv, __res_query, [LDAP_LIBS="-lresolv"])])
 		AC_CHECK_LIB(socket, bind, [LDAP_LIBS="$LDAP_LIBS -lsocket"])
 		AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])
 		AC_CHECK_LIB(ldap, ldap_open, [