diff options
| author | Mathieu Trudel-Lapierre <mathieu@canonical.com> | 2011-06-03 21:12:32 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:42:25 +0800 |
| commit | e146d67bad3fb4d9c9b32ae4e79c354c0953f51e (patch) | |
| tree | 25426f075398db8a220a58afb8adf0b6f900cfdf | |
| parent | ef4a4446d04ea736821f0806de2c3de78382292e (diff) | |
| download | gsoc2013-evolution-e146d67bad3fb4d9c9b32ae4e79c354c0953f51e.tar gsoc2013-evolution-e146d67bad3fb4d9c9b32ae4e79c354c0953f51e.tar.gz gsoc2013-evolution-e146d67bad3fb4d9c9b32ae4e79c354c0953f51e.tar.bz2 gsoc2013-evolution-e146d67bad3fb4d9c9b32ae4e79c354c0953f51e.tar.lz gsoc2013-evolution-e146d67bad3fb4d9c9b32ae4e79c354c0953f51e.tar.xz gsoc2013-evolution-e146d67bad3fb4d9c9b32ae4e79c354c0953f51e.tar.zst gsoc2013-evolution-e146d67bad3fb4d9c9b32ae4e79c354c0953f51e.zip | |
Bug #633948 - Try harder to use -lresolv in LDAP_LIBS
| -rw-r--r-- | m4/evo_ldap_check.m4 | 2 | ||||
| -rw-r--r-- | 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 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, [ |