diff --git acinclude.m4 acinclude.m4
deleted file mode 100644
index 339be3c..0000000
--- acinclude.m4
+++ /dev/null
@@ -1,333 +0,0 @@
-# evolution/acinclude.m4
-# shared configure.in hacks between Evolution and Connector
-
-
-# EVO_PURIFY_SUPPORT
-# Add --enable-purify. If the user turns it on, subst PURIFY and set
-# the automake conditional ENABLE_PURIFY
-AC_DEFUN([EVO_PURIFY_SUPPORT], [
-	AC_ARG_ENABLE(purify, 
-	[  --enable-purify=[no/yes]      Enable support for building executables with Purify.],,enable_purify=no)
-	AC_PATH_PROG(PURIFY, purify, impure)
-	AC_ARG_WITH(purify-options, [  --with-purify-options=OPTIONS      Options passed to the purify command line (defaults to PURIFYOPTIONS variable).])
-	if test "x$with_purify_options" = "xno"; then
-		with_purify_options="-always-use-cache-dir=yes -cache-dir=/gnome/lib/purify"
-	fi
-	if test "x$PURIFYOPTIONS" = "x"; then
-		PURIFYOPTIONS=$with_purify_options
-	fi
-	AC_SUBST(PURIFY)
-	AM_CONDITIONAL(ENABLE_PURIFY, test "x$enable_purify" = "xyes" -a "x$PURIFY" != "ximpure")
-	PURIFY="$PURIFY $PURIFYOPTIONS"
-])
-
-
-# EVO_LDAP_CHECK(default)
-# Add --with-openldap and --with-static-ldap options. --with-openldap
-# defaults to the given value if not specified. If LDAP support is
-# configured, HAVE_LDAP will be defined and the automake conditional
-# ENABLE_LDAP will be set. LDAP_CFLAGS and LDAP_LIBS will be set
-# appropriately.
-AC_DEFUN([EVO_LDAP_CHECK], [
-	default="$1"
-
-	AC_ARG_WITH(openldap,     [  --with-openldap=[no/yes/PREFIX]      Enable LDAP support in evolution])
-	AC_ARG_WITH(static-ldap,  [  --with-static-ldap=[no/yes]          Link LDAP support statically into evolution ])
-	AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=$default}")
-	case $ac_cv_with_openldap in
-	no|"")
-		with_openldap=no
-		;;
-	yes)
-		with_openldap=/usr
-		;;
-	*)
-		with_openldap=$ac_cv_with_openldap
-		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
-		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
-		;;
-	esac
-
-	if test "$with_openldap" != no; then
-		AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
-
-		case $with_static_ldap in
-		no|"")
-			with_static_ldap=no
-			;;
-		*)
-			with_static_ldap=yes
-			;;
-		esac
-
-		AC_CACHE_CHECK(if OpenLDAP is version 2.x, ac_cv_openldap_version2, [
-			CPPFLAGS_save="$CPPFLAGS"
-			CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS"
-			AC_EGREP_CPP(yes, [
-				#include "ldap.h"
-				#if LDAP_VENDOR_VERSION > 20000
-				yes
-				#endif
-			], ac_cv_openldap_version2=yes, ac_cv_openldap_version2=no)
-			CPPFLAGS="$CPPFLAGS_save"
-		])
-		if test "$ac_cv_openldap_version2" = no; then
-			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")
-		AC_CHECK_LIB(lber, ber_get_tag, [
-			if test "$with_static_ldap" = "yes"; then
-				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
-
-				# libldap might depend on OpenSSL... We need to pull
-				# in the dependency libs explicitly here since we're
-				# not using libtool for the configure test.
-				if test -f $with_openldap/lib/libldap.la; then
-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
-				fi
-			else
-				LDAP_LIBS="-llber $LDAP_LIBS"
-			fi
-			AC_CHECK_LIB(ldap, ldap_open, [
-					if test $with_static_ldap = "yes"; then
-						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
-					else
-						LDAP_LIBS="-lldap $LDAP_LIBS"
-					fi],
-				LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)
-			LDAP_LIBS="$LDAP_LDFLAGS $LDAP_LIBS"
-		], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)
-
-		if test -z "$LDAP_LIBS"; then
-			AC_MSG_ERROR(could not find OpenLDAP libraries)
-		fi
-
-		AC_SUBST(LDAP_CFLAGS)
-		AC_SUBST(LDAP_LIBS)
-	fi
-	AM_CONDITIONAL(ENABLE_LDAP, test $with_openldap != no)
-])
-
-# EVO_SUNLDAP_CHECK
-# Add --with-sunldap and --with-static-sunldap options. --with-sunldap
-# defaults to the given value if not specified. If LDAP support is
-# configured, HAVE_LDAP will be defined and the automake conditional
-# ENABLE_LDAP will be set. LDAP_CFLAGS and LDAP_LIBS will be set
-# appropriately, and --with-sunldap and --with-openldap is mutually exclusive.
-AC_DEFUN([EVO_SUNLDAP_CHECK], [
-        default="$1"
-
-        AC_ARG_WITH(sunldap,     [  --with-sunldap=[no/yes/PREFIX]      Enable SunLDAP support in evolution])
-        AC_ARG_WITH(static-sunldap,  [  --with-static-sunldap=[no/yes]          Link SunLDAP support statically into evolution ])
-        AC_CACHE_CHECK([for SunLDAP], ac_cv_with_sunldap, ac_cv_with_sunldap="${with_sunldap:=$default}")
-        case $ac_cv_with_sunldap in
-        no|"")
-                with_sunldap=no
-                ;;
-        yes)
-                with_sunldap=/usr
-                ;;
-        *)
-                with_sunldap=$ac_cv_with_sunldap
-                LDAP_CFLAGS="-I$ac_cv_with_sunldap/include"
-                LDAP_LDFLAGS="-L$ac_cv_with_sunldap/lib"
-                ;;
-        esac
-
-        if test "$with_sunldap" != no; then
-                AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
-                AC_DEFINE(SUNLDAP, 1, [Define if you use SunLDAP])
-
-                case $with_static_sunldap in
-                no|"")
-                        with_static_sunldap=no
-                        ;;
-                *)
-                        with_static_sunldap=yes
-                        ;;
-                esac
-
-                AC_CACHE_CHECK(if SunLDAP is version 2.x, ac_cv_sunldap_version2, [
-                        CPPFLAGS_save="$CPPFLAGS"
-                        CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS"
-                        AC_EGREP_CPP(yes, [
-                                #include "ldap.h"
-                                #if LDAP_VENDOR_VERSION >= 500
-                                yes
-                                #endif
-                        ], ac_cv_sunldap_version2=yes, ac_cv_sunldap_version2=no)
-                        CPPFLAGS="$CPPFLAGS_save"
-                ])
-                if test "$ac_cv_sunldap_version2" = no; then
-                       AC_MSG_ERROR(evolution requires SunLDAP 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")
-                AC_CHECK_LIB(ldap, ldap_open, [
-                        if test $with_static_sunldap = "yes"; then
-                                LDAP_LIBS="$with_sunldap/lib/libldap.a $LDAP_LIBS"
-                        else
-                                LDAP_LIBS="-lldap $LDAP_LIBS"
-                        fi
-                        if test `uname -s` != "SunOS" ; then
-                                AC_CHECK_LIB(lber, ber_get_tag, [
-                                        if test "$with_static_sunldap" = "yes"; then
-                                                LDAP_LIBS="$with_sunldap/lib/liblber.a $LDAP_LIBS"
-                                                # libldap might depend on OpenSSL... We need to pull
-                                                # in the dependency libs explicitly here since we're
-                                                # not using libtool for the configure test.
-                                                if test -f $with_sunldap/lib/libldap.la; then
-							LDAP_LIBS="`. $with_sunldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
-                                                fi
-                                        else
-                                                LDAP_LIBS="-llber $LDAP_LIBS"
-                                        fi], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)
-                        fi
-                        LDAP_LIBS="$LDAP_LDFLAGS $LDAP_LIBS"
-                ], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)
-
-                if test -z "$LDAP_LIBS"; then
-                       AC_MSG_ERROR(could not find SunLDAP libraries)
-                fi
-
-                AC_SUBST(LDAP_CFLAGS)
-                AC_SUBST(LDAP_LIBS)
-	fi
-	AM_CONDITIONAL(ENABLE_LDAP, test $with_sunldap != no)
-])
-
-# EVO_PTHREAD_CHECK
-AC_DEFUN([EVO_PTHREAD_CHECK],[
-	PTHREAD_LIB=""
-	AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread",
-		[AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads",
-		    [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r",
-			[AC_CHECK_LIB(pthread, __pthread_attr_init_system, PTHREAD_LIB="-lpthread",
-				[AC_CHECK_FUNC(pthread_create)]
-			)]
-		    )]
-		)]
-	)
-	AC_SUBST(PTHREAD_LIB)
-	AC_PROVIDE([EVO_PTHREAD_CHECK])
-])
-dnl -*- mode: autoconf -*-
-
-# serial 1
-
-dnl Usage:
-dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
-  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-  dnl for overriding the documentation installation directory
-  AC_ARG_WITH(html-dir,
-    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-    [with_html_dir='${datadir}/gtk-doc/html'])
-  HTML_DIR="$with_html_dir"
-  AC_SUBST(HTML_DIR)
-
-  dnl enable/disable documentation building
-  AC_ARG_ENABLE(gtk-doc,
-    AC_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [default=no]]),,
-    enable_gtk_doc=no)
-
-  have_gtk_doc=no
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-    have_gtk_doc=yes
-  fi
-
-  dnl do we want to do a version check?
-ifelse([$1],[],,
-  [gtk_doc_min_version=$1
-  if test "$have_gtk_doc" = yes; then
-    AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-    if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-      have_gtk_doc=no
-    fi
-  fi
-])
-  if test x$enable_gtk_doc = xyes; then
-    if test "$have_gtk_doc" != yes; then
-      enable_gtk_doc=no
-    fi
-  fi
-
-  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-])
-dnl as-compiler-flag.m4 0.1.0
-
-dnl autostars m4 macro for detection of compiler flags
-
-dnl David Schleef <ds@schleef.org>
-
-dnl $Id: as-compiler-flag.m4,v 1.1 2005/12/15 23:35:19 ds Exp $
-
-dnl AS_COMPILER_FLAG(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
-dnl Tries to compile with the given CFLAGS.
-dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags,
-dnl and ACTION-IF-NOT-ACCEPTED otherwise.
-
-AC_DEFUN([AS_COMPILER_FLAG],
-[
-  AC_MSG_CHECKING([to see if compiler understands $1])
-
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $1"
-
-  AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
-  CFLAGS="$save_CFLAGS"
-
-  if test "X$flag_ok" = Xyes ; then
-    m4_ifvaln([$2],[$2])
-    true
-  else
-    m4_ifvaln([$3],[$3])
-    true
-  fi
-  AC_MSG_RESULT([$flag_ok])
-])
-
-dnl AS_COMPILER_FLAGS(VAR, FLAGS)
-dnl Tries to compile with the given CFLAGS.
-
-AC_DEFUN([AS_COMPILER_FLAGS],
-[
-  list=$2
-  flags_supported=""
-  flags_unsupported=""
-  AC_MSG_CHECKING([for supported compiler flags])
-  for each in $list
-  do
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS $each"
-    AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
-    CFLAGS="$save_CFLAGS"
-
-    if test "X$flag_ok" = Xyes ; then
-      flags_supported="$flags_supported $each"
-    else
-      flags_unsupported="$flags_unsupported $each"
-    fi
-  done
-  AC_MSG_RESULT([$flags_supported])
-  if test "X$flags_unsupported" != X ; then
-    AC_MSG_WARN([unsupported compiler flags: $flags_unsupported])
-  fi
-  $1="$$1 $flags_supported"
-])
-
diff --git m4/as-compiler-flag.m4 m4/as-compiler-flag.m4
new file mode 100644
index 0000000..1c74267
--- /dev/null
+++ m4/as-compiler-flag.m4
@@ -0,0 +1,61 @@
+dnl as-compiler-flag.m4 0.1.0
+
+dnl autostars m4 macro for detection of compiler flags
+
+dnl David Schleef <ds@schleef.org>
+
+dnl $Id: as-compiler-flag.m4,v 1.1 2005/12/15 23:35:19 ds Exp $
+
+dnl AS_COMPILER_FLAG(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
+dnl Tries to compile with the given CFLAGS.
+dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags,
+dnl and ACTION-IF-NOT-ACCEPTED otherwise.
+
+AC_DEFUN([AS_COMPILER_FLAG],
+[
+  AC_MSG_CHECKING([to see if compiler understands $1])
+
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $1"
+
+  AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
+  CFLAGS="$save_CFLAGS"
+
+  if test "X$flag_ok" = Xyes ; then
+    m4_ifvaln([$2],[$2])
+    true
+  else
+    m4_ifvaln([$3],[$3])
+    true
+  fi
+  AC_MSG_RESULT([$flag_ok])
+])
+
+dnl AS_COMPILER_FLAGS(VAR, FLAGS)
+dnl Tries to compile with the given CFLAGS.
+
+AC_DEFUN([AS_COMPILER_FLAGS],
+[
+  list=$2
+  flags_supported=""
+  flags_unsupported=""
+  AC_MSG_CHECKING([for supported compiler flags])
+  for each in $list
+  do
+    save_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $each"
+    AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
+    CFLAGS="$save_CFLAGS"
+
+    if test "X$flag_ok" = Xyes ; then
+      flags_supported="$flags_supported $each"
+    else
+      flags_unsupported="$flags_unsupported $each"
+    fi
+  done
+  AC_MSG_RESULT([$flags_supported])
+  if test "X$flags_unsupported" != X ; then
+    AC_MSG_WARN([unsupported compiler flags: $flags_unsupported])
+  fi
+  $1="$$1 $flags_supported"
+])
diff --git m4/evo_ldap_check.m4 m4/evo_ldap_check.m4
new file mode 100644
index 0000000..a029ac7
--- /dev/null
+++ m4/evo_ldap_check.m4
@@ -0,0 +1,92 @@
+dnl EVO_LDAP_CHECK(default)
+dnl Add --with-openldap and --with-static-ldap options. --with-openldap
+dnl defaults to the given value if not specified. If LDAP support is
+dnl configured, HAVE_LDAP will be defined and the automake conditional
+dnl ENABLE_LDAP will be set. LDAP_CFLAGS and LDAP_LIBS will be set
+dnl appropriately.
+#serial 0.1
+AC_DEFUN([EVO_LDAP_CHECK],[
+	default="$1"
+	AC_ARG_WITH([openldap],
+		[AS_HELP_STRING([--with-openldap],
+		[Enable LDAP support in evolution])])
+	AC_ARG_WITH([static-ldap],
+		[AS_HELP_STRING([--with-static-ldap],
+		[Link LDAP support statically into evolution])])
+	AC_CACHE_CHECK([for OpenLDAP], [ac_cv_with_openldap], [ac_cv_with_openldap="${with_openldap:=$default}"])
+	case $ac_cv_with_openldap in
+	no|"")
+		with_openldap=no
+		;;
+	yes)
+		with_openldap=/usr
+		;;
+	*)
+		with_openldap=$ac_cv_with_openldap
+		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
+		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
+		;;
+	esac
+
+	if test "$with_openldap" != no; then
+		AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
+
+		case $with_static_ldap in
+		no|"")
+			with_static_ldap=no
+			;;
+		*)
+			with_static_ldap=yes
+			;;
+		esac
+
+		AC_CACHE_CHECK([if OpenLDAP is version 2.x], [ac_cv_openldap_version2], [
+			CPPFLAGS_save="$CPPFLAGS"
+			CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS"
+			AC_EGREP_CPP(yes, [
+				#include "ldap.h"
+				#if LDAP_VENDOR_VERSION > 20000
+				yes
+				#endif
+			], [ac_cv_openldap_version2=yes], [ac_cv_openldap_version2=no])
+			CPPFLAGS="$CPPFLAGS_save"
+		])
+		if test "$ac_cv_openldap_version2" = no; then
+			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"])
+		AC_CHECK_LIB(lber, ber_get_tag, [
+			if test "$with_static_ldap" = "yes"; then
+				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
+
+				# libldap might depend on OpenSSL... We need to pull
+				# in the dependency libs explicitly here since we're
+				# not using libtool for the configure test.
+				if test -f $with_openldap/lib/libldap.la; then
+					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
+				fi
+			else
+				LDAP_LIBS="-llber $LDAP_LIBS"
+			fi
+			AC_CHECK_LIB(ldap, ldap_open, [
+					if test $with_static_ldap = "yes"; then
+						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
+					else
+						LDAP_LIBS="-lldap $LDAP_LIBS"
+					fi],
+				[LDAP_LIBS=""], [$LDAP_LDFLAGS $LDAP_LIBS])
+			LDAP_LIBS="$LDAP_LDFLAGS $LDAP_LIBS"
+		], [LDAP_LIBS=""], [$LDAP_LDFLAGS $LDAP_LIBS])
+
+		if test -z "$LDAP_LIBS"; then
+			AC_MSG_ERROR([could not find OpenLDAP libraries])
+		fi
+
+		AC_SUBST(LDAP_CFLAGS)
+		AC_SUBST(LDAP_LIBS)
+	fi
+	AM_CONDITIONAL(ENABLE_LDAP, test "$with_openldap" != "no")
+])
diff --git m4/evo_pthread_check.m4 m4/evo_pthread_check.m4
new file mode 100644
index 0000000..5a96fc5
--- /dev/null
+++ m4/evo_pthread_check.m4
@@ -0,0 +1,16 @@
+dnl EVO_PTHREAD_CHECK
+#serial 0.1
+AC_DEFUN([EVO_PTHREAD_CHECK],[
+	PTHREAD_LIB=""
+	AC_CHECK_LIB(pthread, pthread_create, [PTHREAD_LIB="-lpthread"],
+		[AC_CHECK_LIB(pthreads, pthread_create, [PTHREAD_LIB="-lpthreads"],
+			[AC_CHECK_LIB(c_r, pthread_create, [PTHREAD_LIB="-lc_r"],
+			[AC_CHECK_LIB(pthread, __pthread_attr_init_system, [PTHREAD_LIB="-lpthread"],
+				[AC_CHECK_FUNC(pthread_create)]
+			)]
+			)]
+		)]
+	)
+	AC_SUBST(PTHREAD_LIB)
+	AC_PROVIDE([EVO_PTHREAD_CHECK])
+])
diff --git m4/evo_sunldap_check.m4 m4/evo_sunldap_check.m4
new file mode 100644
index 0000000..bd85534
--- /dev/null
+++ m4/evo_sunldap_check.m4
@@ -0,0 +1,94 @@
+dnl EVO_SUNLDAP_CHECK
+dnl Add --with-sunldap and --with-static-sunldap options. --with-sunldap
+dnl defaults to the given value if not specified. If LDAP support is
+dnl configured, HAVE_LDAP will be defined and the automake conditional
+dnl ENABLE_LDAP will be set. LDAP_CFLAGS and LDAP_LIBS will be set
+dnl appropriately, and --with-sunldap and --with-openldap is mutually exclusive.
+#serial 0.1
+AC_DEFUN([EVO_SUNLDAP_CHECK], [
+	default="$1"
+
+	AC_ARG_WITH([sunldap],
+		[AS_HELP_STRING([--with-sunldap],
+		[Enable SunLDAP support in evolution])])
+	AC_ARG_WITH([static-sunldap],
+		[AS_HELP_STRING([--with-static-sunldap],
+		[Link SunLDAP support statically into evolution])])
+	AC_CACHE_CHECK([for SunLDAP],[ac_cv_with_sunldap],[ac_cv_with_sunldap="${with_sunldap:=$default}"])
+	case $ac_cv_with_sunldap in
+	no|"")
+		with_sunldap=no
+		;;
+	yes)
+		with_sunldap=/usr
+		;;
+	*)
+		with_sunldap=$ac_cv_with_sunldap
+		LDAP_CFLAGS="-I$ac_cv_with_sunldap/include"
+		LDAP_LDFLAGS="-L$ac_cv_with_sunldap/lib"
+		;;
+	esac
+
+	if test "$with_sunldap" != no; then
+		AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
+		AC_DEFINE(SUNLDAP, 1, [Define if you use SunLDAP])
+
+		case $with_static_sunldap in
+		no|"")
+			with_static_sunldap=no
+			;;
+		*)
+			with_static_sunldap=yes
+			;;
+		esac
+
+		AC_CACHE_CHECK([if SunLDAP is version 2.x], [ac_cv_sunldap_version2], [
+			CPPFLAGS_save="$CPPFLAGS"
+			CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS"
+			AC_EGREP_CPP(yes, [
+				#include "ldap.h"
+				#if LDAP_VENDOR_VERSION >= 500
+				yes
+				#endif
+			],[ac_cv_sunldap_version2=yes],[ac_cv_sunldap_version2=no])
+			CPPFLAGS="$CPPFLAGS_save"
+		])
+		if test "$ac_cv_sunldap_version2" = no; then
+		       AC_MSG_ERROR([evolution requires SunLDAP 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"])
+		AC_CHECK_LIB(ldap, ldap_open, [
+			if test $with_static_sunldap = "yes"; then
+				LDAP_LIBS="$with_sunldap/lib/libldap.a $LDAP_LIBS"
+			else
+				LDAP_LIBS="-lldap $LDAP_LIBS"
+			fi
+			if test `uname -s` != "SunOS" ; then
+				AC_CHECK_LIB(lber, ber_get_tag, [
+					if test "$with_static_sunldap" = "yes"; then
+						LDAP_LIBS="$with_sunldap/lib/liblber.a $LDAP_LIBS"
+						# libldap might depend on OpenSSL... We need to pull
+						# in the dependency libs explicitly here since we're
+						# not using libtool for the configure test.
+						if test -f $with_sunldap/lib/libldap.la; then
+							LDAP_LIBS="`. $with_sunldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
+						fi
+					else
+						LDAP_LIBS="-llber $LDAP_LIBS"
+					fi], [LDAP_LIBS=""], [$LDAP_LDFLAGS $LDAP_LIBS])
+			fi
+			LDAP_LIBS="$LDAP_LDFLAGS $LDAP_LIBS"
+		], [LDAP_LIBS=""], [$LDAP_LDFLAGS $LDAP_LIBS])
+
+		if test -z "$LDAP_LIBS"; then
+			AC_MSG_ERROR([could not find SunLDAP libraries])
+		fi
+
+		AC_SUBST(LDAP_CFLAGS)
+		AC_SUBST(LDAP_LIBS)
+	fi
+	AM_CONDITIONAL(ENABLE_LDAP, test "$with_sunldap" != "no")
+])
