]>
Commit | Line | Data |
---|---|---|
cb0ba090 MB |
1 | --- evolution-3.1.91/m4/evo_ldap_check.m4.orig 2011-06-08 19:12:25.000000000 +0200 |
2 | +++ evolution-3.1.91/m4/evo_ldap_check.m4 2011-09-12 08:22:43.075017176 +0200 | |
3 | @@ -55,9 +55,9 @@ AC_DEFUN([EVO_LDAP_CHECK],[ | |
d21db05d | 4 | AC_MSG_ERROR([evolution requires OpenLDAP version >= 2]) |
7eb84f0b JB |
5 | fi |
6 | ||
cb0ba090 | 7 | - AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"], [AC_CHECK_LIB(resolv, __res_query, [LDAP_LIBS="-lresolv"])]) |
d21db05d MB |
8 | - AC_CHECK_LIB(socket, bind, [LDAP_LIBS="$LDAP_LIBS -lsocket"]) |
9 | - AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"]) | |
cb0ba090 MB |
10 | + dnl AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"], [AC_CHECK_LIB(resolv, __res_query, [LDAP_LIBS="-lresolv"])]) |
11 | + AC_CHECK_FUNC(bind, , [AC_CHECK_LIB(socket, bind, [LDAP_LIBS="$LDAP_LIBS -lsocket"])]) | |
12 | + AC_CHECK_FUNC(gethostbyaddr, , [AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])]) | |
7eb84f0b JB |
13 | AC_CHECK_LIB(lber, ber_get_tag, [ |
14 | if test "$with_static_ldap" = "yes"; then | |
15 | LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS" |