|
|
@ -1,7 +1,7 @@
|
|
|
|
diff -up evolution-data-server-2.27.90/acinclude.m4.fix-64bit-acinclude evolution-data-server-2.27.90/acinclude.m4
|
|
|
|
diff -up evolution-data-server-2.27.91/m4/evo_ldap_check.m4.fix-64bit-acinclude evolution-data-server-2.27.91/m4/evo_ldap_check.m4
|
|
|
|
--- evolution-data-server-2.27.90/acinclude.m4.fix-64bit-acinclude 2009-08-10 13:05:37.000000000 +0200
|
|
|
|
--- evolution-data-server-2.27.91/m4/evo_ldap_check.m4.fix-64bit-acinclude 2009-08-24 12:45:52.000000000 +0200
|
|
|
|
+++ evolution-data-server-2.27.90/acinclude.m4 2009-08-10 17:03:16.000000000 +0200
|
|
|
|
+++ evolution-data-server-2.27.91/m4/evo_ldap_check.m4 2009-08-24 12:48:08.000000000 +0200
|
|
|
|
@@ -43,6 +43,18 @@ AC_DEFUN([EVO_LDAP_CHECK], [
|
|
|
|
@@ -14,6 +14,18 @@ AC_DEFUN([EVO_LDAP_CHECK],[
|
|
|
|
[AS_HELP_STRING([--with-static-ldap],
|
|
|
|
[AS_HELP_STRING([--with-static-ldap],
|
|
|
|
[Link LDAP support statically into evolution])])
|
|
|
|
[Link LDAP support statically into evolution])])
|
|
|
|
AC_CACHE_CHECK([for OpenLDAP], [ac_cv_with_openldap], [ac_cv_with_openldap="${with_openldap:=$default}"])
|
|
|
|
AC_CACHE_CHECK([for OpenLDAP], [ac_cv_with_openldap], [ac_cv_with_openldap="${with_openldap:=$default}"])
|
|
|
@ -20,7 +20,7 @@ diff -up evolution-data-server-2.27.90/acinclude.m4.fix-64bit-acinclude evolutio
|
|
|
|
case $ac_cv_with_openldap in
|
|
|
|
case $ac_cv_with_openldap in
|
|
|
|
no|"")
|
|
|
|
no|"")
|
|
|
|
with_openldap=no
|
|
|
|
with_openldap=no
|
|
|
|
@@ -53,7 +65,7 @@ AC_DEFUN([EVO_LDAP_CHECK], [
|
|
|
|
@@ -24,7 +36,7 @@ AC_DEFUN([EVO_LDAP_CHECK],[
|
|
|
|
*)
|
|
|
|
*)
|
|
|
|
with_openldap=$ac_cv_with_openldap
|
|
|
|
with_openldap=$ac_cv_with_openldap
|
|
|
|
LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
|
|
|
|
LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
|
|
|
@ -29,7 +29,7 @@ diff -up evolution-data-server-2.27.90/acinclude.m4.fix-64bit-acinclude evolutio
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
|
@@ -89,20 +101,20 @@ AC_DEFUN([EVO_LDAP_CHECK], [
|
|
|
|
@@ -60,20 +72,20 @@ AC_DEFUN([EVO_LDAP_CHECK],[
|
|
|
|
AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])
|
|
|
|
AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])
|
|
|
|
AC_CHECK_LIB(lber, ber_get_tag, [
|
|
|
|
AC_CHECK_LIB(lber, ber_get_tag, [
|
|
|
|
if test "$with_static_ldap" = "yes"; then
|
|
|
|
if test "$with_static_ldap" = "yes"; then
|
|
|
|