From e146d67bad3fb4d9c9b32ae4e79c354c0953f51e Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 3 Jun 2011 15:12:32 +0200 Subject: 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(-) (limited to 'm4') diff --git a/m4/evo_ldap_check.m4 b/m4/evo_ldap_check.m4 index a029ac70bf..bc0251102e 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 bd85534ed8..b52aac3d66 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, [ -- cgit