From: Mathieu Trudel-Lapierre Date: Fri, 3 Jun 2011 13:10:27 +0000 (+0200) Subject: Bug #633948 - Try harder to use -lresolv in LDAP_LIBS X-Git-Tag: upstream/3.7.4~1988 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44fecdf32eb8e1cb6067d495bfb762c5f2e40c97;p=platform%2Fupstream%2Fevolution-data-server.git Bug #633948 - Try harder to use -lresolv in LDAP_LIBS --- 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, [