- updated to 3.16.2.1

[packages/evolution.git] / evolution-nolibs.patch

diff --git a/evolution-nolibs.patch b/evolution-nolibs.patch
index f002d0d8823d0c52588f33abca26ad819e2e7e53..ee8b99bf8859b683cea1aa36bfe8dd9b76c9e682 100644 (file)
--- a/evolution-nolibs.patch
+++ b/evolution-nolibs.patch
@@ -1,15 +1,15 @@
---- evolution-1.4.0/acinclude.m4.orig  Mon Apr  7 17:41:13 2003
-+++ evolution-1.4.0/acinclude.m4       Thu Jul 10 11:50:10 2003
-@@ -129,9 +129,9 @@
-                       AC_MSG_ERROR(evolution requires OpenLDAP version >= 2)
+--- evolution-3.1.91/m4/evo_ldap_check.m4.orig 2011-06-08 19:12:25.000000000 +0200
++++ evolution-3.1.91/m4/evo_ldap_check.m4      2011-09-12 08:22:43.075017176 +0200
+@@ -55,9 +55,9 @@ 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(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")
--              AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
-+              dnl AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="-lresolv")
-+              AC_CHECK_FUNC(bind, , [AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")])
-+              AC_CHECK_FUNC(gethostbyaddr, , [AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")])
+-              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"])
++              dnl AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"], [AC_CHECK_LIB(resolv, __res_query, [LDAP_LIBS="-lresolv"])])
++              AC_CHECK_FUNC(bind, , [AC_CHECK_LIB(socket, bind, [LDAP_LIBS="$LDAP_LIBS -lsocket"])])
++              AC_CHECK_FUNC(gethostbyaddr, , [AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])])
                AC_CHECK_LIB(lber, ber_get_tag, [
                        if test "$with_static_ldap" = "yes"; then
                                LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"