CamelStoreClass: Rename compare_folder_name to equal_folder_name.
[platform/upstream/evolution-data-server.git] / configure.ac
index 8952ba5..ee5533e 100644 (file)
@@ -1,8 +1,8 @@
 
 dnl Evolution-Data-Server version
 m4_define([eds_major_version], [3])
-m4_define([eds_minor_version], [1])
-m4_define([eds_micro_version], [5])
+m4_define([eds_minor_version], [5])
+m4_define([eds_micro_version], [4])
 
 m4_define([eds_version],
        [eds_major_version.eds_minor_version.eds_micro_version])
@@ -11,8 +11,8 @@ dnl Base Version: This is for API/version tracking for things like
 dnl Bonobo server files.  This should always be the major/minor of
 dnl the stable version or stable version to be.  Note, this is set
 dnl the way it is so that GETTEXT_PACKAGE will be parsed correctly.
-BASE_VERSION=3.2
-m4_define([base_version], [3.2])
+BASE_VERSION=3.6
+m4_define([base_version], [3.6])
 
 dnl This number is meaningless, but we're now stuck with it in our
 dnl library names for backward compatibility.
@@ -21,7 +21,7 @@ m4_define([api_version], [1.2])
 dnl Autoconf / Automake Initialization
 AC_PREREQ(2.62)
 AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
-AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar -Wall -Wno-portability -Werror foreign])
+AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar dist-xz no-dist-gzip -Wall -Wno-portability foreign])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(README)
 AC_CONFIG_HEADERS(config.h)
@@ -33,18 +33,20 @@ dnl Automake 1.11 - Silent Build Rules
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl Required Package Versions
-m4_define([glib_minimum_version], [2.28])
-m4_define([gtk_minimum_version], [3.0])
-m4_define([gconf_minimum_version], [2.0.0])            dnl XXX Just a Guess
+m4_define([glib_minimum_version], [2.32])
+m4_define([gtk_minimum_version], [3.2])
+m4_define([gcr_minimum_version], [3.4])
 m4_define([gnome_keyring_minimum_version], [2.20.1])
-m4_define([goa_minimum_version], [3.1.1])
 m4_define([libxml_minimum_version], [2.0.0])           dnl XXX Just a Guess
-m4_define([libsoup_minimum_version], [2.31.2])
-m4_define([libgdata_minimum_version], [0.7.0])
+m4_define([libsoup_minimum_version], [2.38.1])
+m4_define([libgdata_minimum_version], [0.10])
 m4_define([oauth_minimum_version], [0.9.4])
 m4_define([sqlite_minimum_version], [3.5])
 m4_define([libical_minimum_version], [0.43])
-m4_define([gweather_minimum_version], [2.90.0])
+
+dnl Optional Packages
+m4_define([goa_minimum_version], [3.2])
+m4_define([gweather_minimum_version], [3.5.0])
 
 AC_SUBST([BASE_VERSION],[base_version])
 AC_SUBST([API_VERSION],[api_version])
@@ -55,11 +57,14 @@ EDS_MAJOR_VERSION=eds_major_version
 EDS_MINOR_VERSION=eds_minor_version
 EDS_MICRO_VERSION=eds_micro_version
 
+GLIB_GSETTINGS
+
 dnl ******************************
 dnl D-Bus versioning
 dnl ******************************
-ADDRESS_BOOK_DBUS_SERVICE_NAME="org.gnome.evolution.dataserver.AddressBook1"
-CALENDAR_DBUS_SERVICE_NAME="org.gnome.evolution.dataserver.Calendar1"
+ADDRESS_BOOK_DBUS_SERVICE_NAME="org.gnome.evolution.dataserver.AddressBook4"
+CALENDAR_DBUS_SERVICE_NAME="org.gnome.evolution.dataserver.Calendar3"
+SOURCES_DBUS_SERVICE_NAME="org.gnome.evolution.dataserver.Sources0"
 
 AC_DEFINE_UNQUOTED(
        ADDRESS_BOOK_DBUS_SERVICE_NAME,
@@ -71,45 +76,47 @@ AC_DEFINE_UNQUOTED(
        ["$CALENDAR_DBUS_SERVICE_NAME"],
        [D-Bus service name for the calendar factory])
 
+AC_DEFINE_UNQUOTED(
+       SOURCES_DBUS_SERVICE_NAME,
+       ["$SOURCES_DBUS_SERVICE_NAME"],
+       [D-Bus service name for the source registry])
+
 AC_SUBST(ADDRESS_BOOK_DBUS_SERVICE_NAME)
 AC_SUBST(CALENDAR_DBUS_SERVICE_NAME)
+AC_SUBST(SOURCES_DBUS_SERVICE_NAME)
 
 dnl ******************************
 dnl Libtool versioning
 dnl ******************************
-LIBEDATASERVER_CURRENT=14
+LIBEDATASERVER_CURRENT=17
 LIBEDATASERVER_REVISION=0
 LIBEDATASERVER_AGE=0
 
-LIBEDATASERVERUI_CURRENT=1
+LIBEDATASERVERUI_CURRENT=4
 LIBEDATASERVERUI_REVISION=0
 LIBEDATASERVERUI_AGE=0
 
-LIBECAL_CURRENT=11
-LIBECAL_REVISION=2
-LIBECAL_AGE=2
+LIBECAL_CURRENT=15
+LIBECAL_REVISION=0
+LIBECAL_AGE=0
 
-LIBEDATACAL_CURRENT=12
+LIBEDATACAL_CURRENT=18
 LIBEDATACAL_REVISION=0
 LIBEDATACAL_AGE=0
 
-LIBEDATABOOK_CURRENT=10
+LIBEDATABOOK_CURRENT=15
 LIBEDATABOOK_REVISION=0
 LIBEDATABOOK_AGE=0
 
-LIBEBOOK_CURRENT=14
+LIBEBOOK_CURRENT=17
 LIBEBOOK_REVISION=1
 LIBEBOOK_AGE=3
 
-LIBEGROUPWISE_CURRENT=13
-LIBEGROUPWISE_REVISION=1
-LIBEGROUPWISE_AGE=0
-
-LIBCAMEL_CURRENT=28
+LIBCAMEL_CURRENT=39
 LIBCAMEL_REVISION=0
 LIBCAMEL_AGE=0
 
-LIBEBACKEND_CURRENT=1
+LIBEBACKEND_CURRENT=4
 LIBEBACKEND_REVISION=0
 LIBEBACKEND_AGE=0
 
@@ -134,9 +141,6 @@ AC_SUBST(LIBEBOOK_AGE)
 AC_SUBST(LIBEDATABOOK_CURRENT)
 AC_SUBST(LIBEDATABOOK_REVISION)
 AC_SUBST(LIBEDATABOOK_AGE)
-AC_SUBST(LIBEGROUPWISE_CURRENT)
-AC_SUBST(LIBEGROUPWISE_REVISION)
-AC_SUBST(LIBEGROUPWISE_AGE)
 AC_SUBST(LIBCAMEL_CURRENT)
 AC_SUBST(LIBCAMEL_REVISION)
 AC_SUBST(LIBCAMEL_AGE)
@@ -153,15 +157,11 @@ dnl ******************************
 dnl Compiler Warning Flags
 dnl ******************************
 AS_COMPILER_FLAGS(WARNING_FLAGS,
-       "-DPANGO_DISABLE_DEPRECATED
-       -DGDK_PIXBUF_DISABLE_DEPRECATED
-       -DG_DISABLE_SINGLE_INCLUDES
-       -DGTK_DISABLE_SINGLE_INCLUDES
-       -DGSEAL_ENABLE
-       -Wall -Wextra
+       "-Wall -Wextra
        -Wno-missing-field-initializers
        -Wno-sign-compare
        -Wno-unused-parameter
+       -Wno-deprecated-declarations
        -Wdeclaration-after-statement
        -Werror-implicit-function-declaration
        -Wformat-security -Winit-self
@@ -209,7 +209,11 @@ esac
 dnl ******************************
 dnl Initialize maintainer mode
 dnl ******************************
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
+
+if test "x$enable_maintainer_mode" = "xyes" ; then
+       AC_DEFINE(ENABLE_MAINTAINER_MODE, 1, [Configured with enabled maintainer mode])
+fi
 
 AC_PROG_CC
 AC_PROG_CPP
@@ -238,18 +242,6 @@ if test "x${GCC}" = "xyes"; then
 fi
 
 dnl ******************************
-dnl Test whether jw is installed
-dnl ******************************
-AC_PATH_PROG(JW,jw,no)
-if test "x$JW" = "xno"; then
-       HAVE_JW="no"
-else
-       HAVE_JW="yes"
-fi
-AM_CONDITIONAL(HAVE_JW, test "x$HAVE_JW" = "xyes")
-AC_SUBST(HAVE_JW)
-
-dnl ******************************
 dnl I18N stuff
 dnl ******************************
 IT_PROG_INTLTOOL([0.35.5])
@@ -275,7 +267,15 @@ PKG_PROG_PKG_CONFIG
 dnl ******************************
 dnl Gtk Doc stuff
 dnl ******************************
-GTK_DOC_CHECK(1.9)
+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+
+dnl The private D-Bus documentation is for developers only.
+AC_ARG_WITH([private-docs],
+       AS_HELP_STRING([--with-private-docs],
+       [Build documentation for private libraries ]
+       [(requires --enable-gtk-doc) [default=no]],),
+       [with_private_docs="$withval"],[with_private_docs="no"])
+AM_CONDITIONAL(WITH_PRIVATE_DOCS, [test x$with_private_docs = xyes])
 
 dnl This must appear after AC_CANONICAL_HOST, which defines $host.
 case "$host" in
@@ -342,14 +342,14 @@ dnl Check for base dependencies early.
 dnl ***********************************
 PKG_CHECK_MODULES(GNOME_PLATFORM,
        [gio-2.0 >= glib_minimum_version
+       gmodule-2.0 >= glib_minimum_version
        gtk+-3.0 >= gtk_minimum_version
-       gconf-2.0 >= gconf_minimum_version
        libxml-2.0 >= libxml_minimum_version
        libsoup-2.4 >= libsoup_minimum_version
        libgdata >= libgdata_minimum_version])
 
-if `$PKG_CONFIG --atleast-version=0.9.1 libgdata`; then
-       AC_DEFINE(HAVE_LIBGDATA_0_9, 1, [libgdata is 0.9.1 or higher])
+if test x$os_win32 = xno; then
+       PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0])
 fi
 
 dnl *******************************
@@ -383,14 +383,31 @@ if test "x$enable_goa" = xyes; then
 fi
 AM_CONDITIONAL(HAVE_GOA, [test x$enable_goa = xyes])
 
+dnl GoaPasswordBased was introduced in version 3.5.
+if `$PKG_CONFIG --atleast-version=3.5 goa-1.0`; then
+       AC_DEFINE(HAVE_GOA_PASSWORD_BASED,1,[Have GoaPasswordBased in goa-1.0])
+fi
+
+if test x$os_win32 = xno; then
+       PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0])
+fi
+
+dnl ***********************************
+dnl Check for GNOME Keyring.
+dnl ***********************************
 if test x$os_win32 = xno; then
-  dnl ***********************************
-  dnl Check for GNOME Keyring.
-  dnl ***********************************
-  PKG_CHECK_MODULES(GNOME_KEYRING,
-       [gnome-keyring-1 >= gnome_keyring_minimum_version])
+       PKG_CHECK_MODULES(GNOME_KEYRING,
+               [gnome-keyring-1 >= gnome_keyring_minimum_version])
 fi
+AC_SUBST(GNOME_KEYRING_CFLAGS)
+AC_SUBST(GNOME_KEYRING_LIBS)
 
+dnl **********************************************************
+dnl gcr-base is needed for secure password exchange over D-Bus
+dnl **********************************************************
+PKG_CHECK_MODULES(GCR_BASE, [gcr-base-3 >= gcr_minimum_version])
+AC_SUBST(GCR_BASE_CFLAGS)
+AC_SUBST(GCR_BASE_LIBS)
 
 LIBICAL_REQUIRED=libical_minimum_version
 AC_SUBST(LIBICAL_REQUIRED)
@@ -541,7 +558,7 @@ LIBS="$save_LIBS"
 
 AC_ARG_ENABLE([backtraces],
        [AS_HELP_STRING([--enable-backtraces],
-       [enable backtraces for e_ptr_tracker (default=no)])],
+       [enable backtraces for e_pointer_tracker (default=no)])],
        [enable_backtraces=$enableval], [enable_backtraces=no])
 
 if test "x$enable_backtraces" = xyes; then
@@ -640,17 +657,11 @@ dnl needed by Camel (SSL and S/MIME).
 dnl
 dnl The Evolution security extensions are only built if these libraries are found
 dnl ********************************************************************************
-msg_ssl="no"
 msg_smime="no"
 
-AC_ARG_ENABLE([ssl],
-       AS_HELP_STRING([--enable-ssl],
-       [Enable SSL support through Mozilla nss @<:@default=yes@:>@]),
-       [enable_ssl="$enableval"],[enable_ssl="yes"])
-
 AC_ARG_ENABLE([smime],
        AS_HELP_STRING([--enable-smime],
-       [Enable SMIME support through Mozilla nss @<:@default=yes,requires --enable-ssl@:>@ ]),
+       [Enable SMIME support through Mozilla nss @<:@default=yes@:>@ ]),
        [enable_smime="$enableval"],[enable_smime="yes"])
 
 AC_ARG_WITH([nspr-includes],
@@ -673,172 +684,157 @@ AC_ARG_WITH([nss-libs],
        [Prefix of Mozilla nss3 libs.]),
        [with_nss_libs="$withval"])
 
-if test "x${enable_ssl}" = "xyes"; then
-       if test -n "${with_nspr_includes}" || test -n "${with_nspr_libs}" || test -n "${with_nss_includes}" || test -n "${with_nss_libs}"; then
-               check_manually="yes"
-       else
-               check_manually="no"
-       fi
+if test -n "${with_nspr_includes}" || test -n "${with_nspr_libs}" || test -n "${with_nss_includes}" || test -n "${with_nss_libs}"; then
+       check_manually="yes"
+else
+       check_manually="no"
+fi
 
 dnl check if pkg-config files exist (which are only shipped by distributions, not upstream)
-       if test "x${check_manually}" = "xno"; then
-               AC_MSG_CHECKING(Mozilla NSPR pkg-config module name)
-               mozilla_nspr_pcs="nspr mozilla-nspr firefox-nspr xulrunner-nspr seamonkey-nspr"
-               for pc in $mozilla_nspr_pcs; do
-                       if $PKG_CONFIG --exists $pc; then
-                               AC_MSG_RESULT($pc)
-                               mozilla_nspr=$pc
-                               break;
-                       fi
-               done
-
-               AC_MSG_CHECKING(Mozilla NSS pkg-config module name)
-               mozilla_nss_pcs="nss mozilla-nss firefox-nss xulrunner-nss seamonkey-nss"
-               for pc in $mozilla_nss_pcs; do
-                       if $PKG_CONFIG --exists $pc; then
-                               AC_MSG_RESULT($pc)
-                               mozilla_nss=$pc
-                               break;
-                       fi
-               done
+if test "x${check_manually}" = "xno"; then
+       AC_MSG_CHECKING(Mozilla NSPR pkg-config module name)
+       mozilla_nspr_pcs="nspr mozilla-nspr firefox-nspr xulrunner-nspr seamonkey-nspr"
+       for pc in $mozilla_nspr_pcs; do
+               if $PKG_CONFIG --exists $pc; then
+                       AC_MSG_RESULT($pc)
+                       mozilla_nspr=$pc
+                       break;
+               fi
+       done
+
+       AC_MSG_CHECKING(Mozilla NSS pkg-config module name)
+       mozilla_nss_pcs="nss mozilla-nss firefox-nss xulrunner-nss seamonkey-nss"
+       for pc in $mozilla_nss_pcs; do
+               if $PKG_CONFIG --exists $pc; then
+                       AC_MSG_RESULT($pc)
+                       mozilla_nss=$pc
+                       break;
+               fi
+       done
 
-               if test -n "$mozilla_nspr" -a -n "$mozilla_nss"; then
-                       msg_ssl="yes"
-                       if test "x$enable_smime" = "xyes"; then
-                               AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
-                               msg_smime="yes"
-                       fi
-                       AC_DEFINE(CAMEL_HAVE_NSS,1,[Define if you have NSS])
-                       AC_DEFINE(CAMEL_HAVE_SSL,1,[Define if you have a supported SSL library])
-                       MANUAL_NSPR_CFLAGS=""
-                       MANUAL_NSPR_LIBS=""
-                       MANUAL_NSS_CFLAGS=""
-                       MANUAL_NSS_LIBS=""
-               else
-                       check_manually="yes"
-                       mozilla_nspr=""
-                       mozilla_nss=""
+       if test -n "$mozilla_nspr" -a -n "$mozilla_nss"; then
+               if test "x$enable_smime" = "xyes"; then
+                       AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
+                       msg_smime="yes"
                fi
+               MANUAL_NSPR_CFLAGS=""
+               MANUAL_NSPR_LIBS=""
+               MANUAL_NSS_CFLAGS=""
+               MANUAL_NSS_LIBS=""
+       else
+               check_manually="yes"
+               mozilla_nspr=""
+               mozilla_nss=""
        fi
+fi
 
-       if test "x${check_manually}" = "xyes"; then
-       dnl ******************
-       dnl Check for NSPR 4
-       dnl ******************
-               AC_MSG_CHECKING([for Mozilla nspr4 includes])
-                       CPPFLAGS_save="$CPPFLAGS"
-                       if test -n "$with_nspr_includes"; then
-                               CPPFLAGS="$CPPFLAGS -I$with_nspr_includes"
-                       fi
+if test "x${check_manually}" = "xyes"; then
+dnl ******************
+dnl Check for NSPR 4
+dnl ******************
+       AC_MSG_CHECKING([for Mozilla nspr4 includes])
+               CPPFLAGS_save="$CPPFLAGS"
+               if test -n "$with_nspr_includes"; then
+                       CPPFLAGS="$CPPFLAGS -I$with_nspr_includes"
+               fi
 
-                       AC_CHECK_HEADERS(nspr.h prio.h,
-                       [moz_nspr_includes="yes"],[moz_nspr_includes="no"])
-                       CPPFLAGS="$CPPFLAGS_save"
+               AC_CHECK_HEADERS(nspr.h prio.h,
+               [moz_nspr_includes="yes"],[moz_nspr_includes="no"])
+               CPPFLAGS="$CPPFLAGS_save"
 
-                       if test "x${moz_nspr_includes}" = "xyes"; then
-                               MANUAL_NSPR_CFLAGS="-I$with_nspr_includes"
-                       else
-                               AC_MSG_FAILURE([NSPR headers not found. Use --with-nspr-includes to specify the include dir of NSPR.])
-                       fi
-               AC_MSG_RESULT([$moz_nspr_includes])
+               if test "x${moz_nspr_includes}" = "xyes"; then
+                       MANUAL_NSPR_CFLAGS="-I$with_nspr_includes"
+               else
+                       AC_MSG_FAILURE([NSPR headers not found. Use --with-nspr-includes to specify the include dir of NSPR.])
+               fi
+       AC_MSG_RESULT([$moz_nspr_includes])
+
+       AC_MSG_CHECKING([for Mozilla nspr libraries])
+               CFLAGS_save="$CFLAGS"
+               LDFLAGS_save="$LDFLAGS"
+               LIBS_save="$LIBS"
+               nsprlibs="$DL_LIB -lplc4 -lplds4 -lnspr4"
+
+               CFLAGS="$CFLAGS $MANUAL_NSPR_CFLAGS"
+               LIBS="$nsprlibs"
+               dnl Test to protect from giving libtool an -L , which results in failure (used below,too)
+               if test -n "${with_nspr_libs}"; then
+                       LDFLAGS="$LDFLAGS -L$with_nspr_libs"
+               else
+                       LDFLAGS="$LDFLAGS"
+               fi
+
+               AC_LINK_IFELSE([AC_LANG_CALL([],[PR_Init])],
+               [moz_nspr_libs="yes"],[moz_nspr_libs="no"])
 
-               AC_MSG_CHECKING([for Mozilla nspr libraries])
-                       CFLAGS_save="$CFLAGS"
-                       LDFLAGS_save="$LDFLAGS"
-                       LIBS_save="$LIBS"
-                       nsprlibs="$DL_LIB -lplc4 -lplds4 -lnspr4"
+               CFLAGS="$CFLAGS_save"
+               LDFLAGS="$LDFLAGS_save"
+               LIBS="$LIBS_save"
 
-                       CFLAGS="$CFLAGS $MANUAL_NSPR_CFLAGS"
-                       LIBS="$nsprlibs"
-                       dnl Test to protect from giving libtool an -L , which results in failure (used below,too)
+               if test "x${moz_nspr_libs}" = "xyes"; then
                        if test -n "${with_nspr_libs}"; then
-                               LDFLAGS="$LDFLAGS -L$with_nspr_libs"
+                               MANUAL_NSPR_LIBS="-L$with_nspr_libs $nsprlibs"
                        else
-                               LDFLAGS="$LDFLAGS"
+                               MANUAL_NSPR_LIBS="$nsprlibs"
                        fi
+               else
+                       AC_MSG_FAILURE([NSPR libs not found. Use --with-nspr-libs to specify the libdir of NSPR.])
+               fi
+       AC_MSG_RESULT([$moz_nspr_libs])
 
-                       AC_LINK_IFELSE([AC_LANG_CALL([],[PR_Init])],
-                       [moz_nspr_libs="yes"],[moz_nspr_libs="no"])
-
-                       CFLAGS="$CFLAGS_save"
-                       LDFLAGS="$LDFLAGS_save"
-                       LIBS="$LIBS_save"
+dnl *****************
+dnl Check for NSS 3
+dnl *****************
+       AC_MSG_CHECKING([for Mozilla nss3 includes])
+               CPPFLAGS_save="$CPPFLAGS"
+               CPPFLAGS="$CPPFLAGS -I$with_nspr_includes -I$with_nss_includes"
 
-                       if test "x${moz_nspr_libs}" = "xyes"; then
-                               if test -n "${with_nspr_libs}"; then
-                                       MANUAL_NSPR_LIBS="-L$with_nspr_libs $nsprlibs"
-                               else
-                                       MANUAL_NSPR_LIBS="$nsprlibs"
-                               fi
-                       else
-                               AC_MSG_FAILURE([NSPR libs not found. Use --with-nspr-libs to specify the libdir of NSPR.])
-                       fi
-               AC_MSG_RESULT([$moz_nspr_libs])
+               AC_CHECK_HEADERS(nss.h ssl.h smime.h,
+               [moz_nss_includes="yes"],[moz_nss_includes="no"])
+               CPPFLAGS="$CPPFLAGS_save"
 
-       dnl *****************
-       dnl Check for NSS 3
-       dnl *****************
-               AC_MSG_CHECKING([for Mozilla nss3 includes])
-                       CPPFLAGS_save="$CPPFLAGS"
-                       CPPFLAGS="$CPPFLAGS -I$with_nspr_includes -I$with_nss_includes"
+               if test "x${moz_nss_includes}" = "xyes"; then
+                       MANUAL_NSS_CFLAGS="-I$with_nss_includes"
+               else
+                       AC_MSG_FAILURE([NSS headers not found. Use --with-nss-includes to specify the include dir of NSS.])
+               fi
+       AC_MSG_RESULT($moz_nss_includes)
 
-                       AC_CHECK_HEADERS(nss.h ssl.h smime.h,
-                       [moz_nss_includes="yes"],[moz_nss_includes="no"])
-                       CPPFLAGS="$CPPFLAGS_save"
+       AC_MSG_CHECKING([for Mozilla nss libraries])
+               LDFLAGS_save="$LDFLAGS"
+               LIBS_save="$LIBS"
+               nsslibs="-lssl3 -lsmime3 -lnss3"
 
-                       if test "x${moz_nss_includes}" = "xyes"; then
-                               MANUAL_NSS_CFLAGS="-I$with_nss_includes"
-                       else
-                               AC_MSG_FAILURE([NSS headers not found. Use --with-nss-includes to specify the include dir of NSS.])
-                       fi
-               AC_MSG_RESULT($moz_nss_includes)
+               LIBS="$nsslibs $nsprlibs"
+               dnl Test to protect from giving libtool an -L , which results in failure (used below,too)
+               if test -n "${with_nss_libs}"; then
+                       LDFLAGS="$LDFLAGS -L$with_nss_libs $MANUAL_NSPR_LIBS"
+               else
+                       LDFLAGS="$LDFLAGS $LDFLAGS_NSPR $MANUAL_NSPR_LIBS"
+               fi
 
-               AC_MSG_CHECKING([for Mozilla nss libraries])
-                       LDFLAGS_save="$LDFLAGS"
-                       LIBS_save="$LIBS"
-                       nsslibs="-lssl3 -lsmime3 -lnss3"
+               AC_LINK_IFELSE([AC_LANG_CALL([],[NSS_Init])],
+               [moz_nss_libs="yes"],[moz_nss_libs="no"])
+               LDFLAGS="$LDFLAGS_save"
+               LIBS="$LIBS_save"
 
-                       LIBS="$nsslibs $nsprlibs"
-                       dnl Test to protect from giving libtool an -L , which results in failure (used below,too)
-                       if test -n "${with_nss_libs}"; then
-                               LDFLAGS="$LDFLAGS -L$with_nss_libs $MANUAL_NSPR_LIBS"
-                       else
-                               LDFLAGS="$LDFLAGS $LDFLAGS_NSPR $MANUAL_NSPR_LIBS"
+               if test "x${moz_nss_libs}" = "xyes"; then
+                       if test "x${enable_smime}" = "xyes"; then
+                               AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
+                               msg_smime="yes"
                        fi
-
-                       AC_LINK_IFELSE([AC_LANG_CALL([],[NSS_Init])],
-                       [moz_nss_libs="yes"],[moz_nss_libs="no"])
-                       LDFLAGS="$LDFLAGS_save"
-                       LIBS="$LIBS_save"
-
-                       if test "x${moz_nss_libs}" = "xyes"; then
-                               AC_DEFINE(CAMEL_HAVE_NSS)
-                               AC_DEFINE(CAMEL_HAVE_SSL)
-                               msg_ssl="yes"
-                               if test "x${enable_smime}" = "xyes"; then
-                                       AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
-                                       msg_smime="yes"
-                               fi
-                               if test -n "${with_nss_libs}"; then
-                                       MANUAL_NSS_LIBS="-L$with_nss_libs $nsslibs"
-                               else
-                                       MANUAL_NSS_LIBS="$nsslibs"
-                               fi
+                       if test -n "${with_nss_libs}"; then
+                               MANUAL_NSS_LIBS="-L$with_nss_libs $nsslibs"
                        else
-                               AC_MSG_FAILURE([NSS libs not found. Use --with-nss-libs to specify the libdir of NSS.])
+                               MANUAL_NSS_LIBS="$nsslibs"
                        fi
-               AC_MSG_RESULT([$moz_nss_libs])
-
-               MANUAL_NSS_CFLAGS="$MANUAL_NSPR_CFLAGS $MANUAL_NSS_CFLAGS"
-               MANUAL_NSS_LIBS="$MANUAL_NSPR_LIBS $MANUAL_NSS_LIBS"
-       fi
-fi
+               else
+                       AC_MSG_FAILURE([NSS libs not found. Use --with-nss-libs to specify the libdir of NSS.])
+               fi
+       AC_MSG_RESULT([$moz_nss_libs])
 
-dnl These flags are used in camel.pc.in.
-if test "x${msg_ssl}" = "xyes"; then
-       CAMEL_SSL_DEFINES="-DCAMEL_HAVE_NSS -DCAMEL_HAVE_SSL"
-else
-       CAMEL_SSL_DEFINES=""
+       MANUAL_NSS_CFLAGS="$MANUAL_NSPR_CFLAGS $MANUAL_NSS_CFLAGS"
+       MANUAL_NSS_LIBS="$MANUAL_NSPR_LIBS $MANUAL_NSS_LIBS"
 fi
 
 AM_CONDITIONAL(ENABLE_SMIME, test "x$msg_smime" != "xno")
@@ -847,7 +843,6 @@ dnl For pkgconfig files.
 AC_SUBST(mozilla_nss)
 AC_SUBST(mozilla_nspr)
 
-AC_SUBST(CAMEL_SSL_DEFINES)
 AC_SUBST(MANUAL_NSPR_CFLAGS)
 AC_SUBST(MANUAL_NSPR_LIBS)
 AC_SUBST(MANUAL_NSS_CFLAGS)
@@ -1095,22 +1090,6 @@ AM_CONDITIONAL(ENABLE_IPv6, [test "x$enable_ipv6" = "xyes"])
 AC_CHECK_HEADER([wspiapi.h],
        [AC_DEFINE([HAVE_WSPIAPI_H], 1, [Have <wspiapi.h>])],,)
 
-dnl ******************************
-dnl Calendar support
-dnl ******************************
-AC_MSG_CHECKING([if we should build the calendar])
-AC_ARG_ENABLE([calendar],
-       AS_HELP_STRING([--enable-calendar=yes/no],
-       [Enable the calendar components (default yes)]),
-       [enable_calendar=$enableval], [enable_calendar=yes])
-
-if test "x${enable_calendar}" != "xno"; then
-       AC_DEFINE(ENABLE_CALENDAR, 1, [Define if Calendar should be built])
-fi
-AM_CONDITIONAL(ENABLE_CALENDAR, [test x$enable_calendar = xyes])
-AC_MSG_RESULT([$enable_calendar])
-msg_calendar=$enable_calendar
-
 dnl **********************************
 dnl Weather calendar backend support
 dnl **********************************
@@ -1119,9 +1098,6 @@ AC_ARG_ENABLE([weather],
        [AS_HELP_STRING([--enable-weather],
        [Build the weather calendar backend (default=yes)])],
        [use_gweather=$enableval], [use_gweather=yes])
-if test "$enable_calendar" = "no"; then
-       use_gweather="no (calendar support is disabled)"
-fi
 
 AC_MSG_RESULT([$use_gweather])
 if test "x$use_gweather" = "xyes"; then
@@ -1285,6 +1261,24 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk
 AC_SUBST_FILE(EVO_MARSHAL_RULE)
 
 dnl ******************************
+dnl Code coverage flags
+dnl ******************************
+
+AC_ARG_ENABLE([code-coverage],
+       AS_HELP_STRING([--enable-code-coverage], [compile with code coverage code]),
+       [enable_code_coverage=$enableval], [enable_code_coverage=no])
+
+if test "x$GCC" = "xyes"; then
+       if test "x$enable_code_coverage" = "xyes"; then
+               CODE_COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage -O0 -ggdb"
+               CODE_COVERAGE_LDFLAGS="-lgcov"
+       fi
+fi
+
+AC_SUBST([CODE_COVERAGE_CFLAGS])
+AC_SUBST([CODE_COVERAGE_LDFLAGS])
+
+dnl ******************************
 dnl Utility macro to set compiler flags for a specific lib.
 dnl EVO_SET_COMPILE_FLAGS(VAR-PREFIX, DEPS, EXTRA-CFLAGS, EXTRA-LIBS)
 dnl ******************************
@@ -1302,7 +1296,7 @@ PKG_CHECK_MODULES(SQLITE3, [sqlite3 >= sqlite_minimum_version])
 dnl ******************************
 dnl libedataserver flags
 dnl ******************************
-E_DATA_SERVER_DEPS="gio-2.0 libxml-2.0 libsoup-2.4 gconf-2.0 $mozilla_nspr"
+E_DATA_SERVER_DEPS="gio-2.0 gmodule-2.0 gnome-keyring-1 libxml-2.0 libsoup-2.4 $mozilla_nspr"
 
 EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, $E_DATA_SERVER_DEPS, $MANUAL_NSPR_CFLAGS, $MANUAL_NSPR_LIBS)
 AC_SUBST(E_DATA_SERVER_CFLAGS)
@@ -1311,13 +1305,20 @@ AC_SUBST(E_DATA_SERVER_LIBS)
 dnl ******************************
 dnl libedataserverui
 dnl ******************************
-E_DATA_SERVER_UI_DEPS="gtk+-3.0 libxml-2.0 gconf-2.0"
+E_DATA_SERVER_UI_DEPS="gtk+-3.0 libxml-2.0 libsoup-2.4"
 
 EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, , )
 AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
 AC_SUBST(E_DATA_SERVER_UI_LIBS)
 
-E_BACKEND_DEPS="gio-2.0 libxml-2.0 gconf-2.0"
+if test "x$enable_maintainer_mode" = "xyes" ; then
+       FACTORY_GTK_CFLAGS=$E_DATA_SERVER_UI_CFLAGS
+       FACTORY_GTK_LIBS=$E_DATA_SERVER_UI_LIBS
+       AC_SUBST(FACTORY_GTK_CFLAGS)
+       AC_SUBST(FACTORY_GTK_LIBS)
+fi
+
+E_BACKEND_DEPS="gio-2.0 gmodule-2.0 gnome-keyring-1 libsoup-2.4 libxml-2.0"
 
 dnl ******************************
 dnl libebackend flags
@@ -1329,7 +1330,7 @@ AC_SUBST(E_BACKEND_LIBS)
 dnl ******************************
 dnl evolution-addressbook flags
 dnl ******************************
-EVOLUTION_ADDRESSBOOK_DEPS="gio-2.0 libxml-2.0 gconf-2.0"
+EVOLUTION_ADDRESSBOOK_DEPS="gio-2.0 libxml-2.0 libsoup-2.4 gnome-keyring-1"
 
 EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
 AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -1338,8 +1339,7 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
 dnl ******************************
 dnl evolution-calendar flags
 dnl ******************************
-if test "x${enable_calendar}" = "xyes"; then
-       EVOLUTION_CALENDAR_DEPS="gio-2.0 libical >= libical_minimum_version libxml-2.0 gconf-2.0"
+EVOLUTION_CALENDAR_DEPS="gio-2.0 libical >= libical_minimum_version libsoup-2.4 libxml-2.0 gnome-keyring-1"
 
 dnl *****
 dnl libical.pc from libical-0.43 has a bug in it's CFlags.
@@ -1371,8 +1371,6 @@ dnl *****
        LIBS=$save_libs
        AC_MSG_RESULT([$ac_cv_have_iuth])
 
-fi
-
 dnl ******************************
 dnl Google flags
 dnl ******************************
@@ -1460,11 +1458,9 @@ fi
 
 AM_CONDITIONAL(ENABLE_LARGEFILE, [test "x$enable_largefile" = "xyes"])
 
-EVO_SET_COMPILE_FLAGS(CAMEL, gio-2.0 $mozilla_nss sqlite3 >= sqlite_minimum_version, $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $LARGEFILE_CFLAGS, -lz $KRB5_LIBS $MANUAL_NSS_LIBS)
+EVO_SET_COMPILE_FLAGS(CAMEL, gio-2.0 gmodule-2.0 $mozilla_nss sqlite3 >= sqlite_minimum_version, $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $LARGEFILE_CFLAGS, -lz $KRB5_LIBS $MANUAL_NSS_LIBS)
 AC_SUBST(CAMEL_CFLAGS)
 AC_SUBST(CAMEL_LIBS)
-AC_SUBST(CAMEL_GROUPWISE_CFLAGS)
-AC_SUBST(CAMEL_GROUPWISE_LIBS)
 
 dnl ******************************
 dnl Special directories
@@ -1486,12 +1482,21 @@ AC_SUBST(privlibdir)
 imagesdir='${datadir}'/pixmaps/evolution-data-server
 AC_SUBST(imagesdir)
 
+moduledir='${libdir}'/evolution-data-server/registry-modules
+AC_SUBST(moduledir)
+
 ebook_backenddir='${libdir}'/evolution-data-server/addressbook-backends
 AC_SUBST(ebook_backenddir)
 
 ecal_backenddir='${libdir}'/evolution-data-server/calendar-backends
 AC_SUBST(ecal_backenddir)
 
+ro_sourcesdir='${datadir}'/evolution-data-server-$BASE_VERSION/ro-sources
+AC_SUBST(ro_sourcesdir)
+
+rw_sourcesdir='${datadir}'/evolution-data-server-$BASE_VERSION/rw-sources
+AC_SUBST(rw_sourcesdir)
+
 if test "x$use_gweather" = "xyes"; then
        weatherdatadir="$privdatadir/weather"
        AC_SUBST(weatherdatadir)
@@ -1504,14 +1509,19 @@ AC_SUBST(camel_providerdir)
 dnl *******************
 dnl D-BUS service stuff
 dnl *******************
-EVO_SUBST_SERVICE_RULE='%.service: %.service.in Makefile ; sed -e "s|\@libexecdir\@|$(libexecdir)|" -e s"|\@ADDRESS_BOOK_DBUS_SERVICE_NAME\@|$(ADDRESS_BOOK_DBUS_SERVICE_NAME)|" -e "s|\@CALENDAR_DBUS_SERVICE_NAME\@|$(CALENDAR_DBUS_SERVICE_NAME)|" $< > $@'
+m4_pattern_allow([AM_V_GEN])
+EVO_SUBST_SERVICE_RULE='%.service: %.service.in Makefile ; $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" -e s"|\@ADDRESS_BOOK_DBUS_SERVICE_NAME\@|$(ADDRESS_BOOK_DBUS_SERVICE_NAME)|" -e "s|\@CALENDAR_DBUS_SERVICE_NAME\@|$(CALENDAR_DBUS_SERVICE_NAME)|" -e "s|\@SOURCES_DBUS_SERVICE_NAME\@|$(SOURCES_DBUS_SERVICE_NAME)|" $< > $@'
 AC_SUBST(EVO_SUBST_SERVICE_RULE)
 
 dnl ******************************
-dnl GConf stuff
+dnl GLib stuff
 dnl ******************************
-AC_PATH_PROG(GCONFTOOL, gconftool-2, [no])
-AM_GCONF_SOURCE_2
+GLIB_GSETTINGS
+AM_PATH_GLIB_2_0
+
+dnl We use AC_SUBST_FILE because AC_SUBST won't deal with newlines
+EVO_MARSHAL_RULE=$srcdir/marshal.mk
+AC_SUBST_FILE(EVO_MARSHAL_RULE)
 
 dnl ******************************
 dnl gperf stuff
@@ -1578,6 +1588,7 @@ addressbook/backends/file/Makefile
 addressbook/backends/vcf/Makefile
 addressbook/backends/ldap/Makefile
 addressbook/backends/google/Makefile
+addressbook/backends/google/tests/Makefile
 addressbook/backends/webdav/Makefile
 art/Makefile
 calendar/Makefile
@@ -1609,7 +1620,8 @@ camel/tests/mime-filter/Makefile
 camel/tests/misc/Makefile
 camel/tests/smime/Makefile
 camel/camel.pc
-camel/camel-provider.pc
+data/Makefile
+data/sources/Makefile
 libebackend/Makefile
 libebackend/libebackend.pc
 libedataserver/Makefile
@@ -1617,6 +1629,16 @@ libedataserver/eds-version.h
 libedataserver/libedataserver.pc
 libedataserverui/Makefile
 libedataserverui/libedataserverui.pc
+modules/Makefile
+modules/cache-reaper/Makefile
+modules/google-backend/Makefile
+modules/online-accounts/Makefile
+modules/yahoo-backend/Makefile
+private/Makefile
+services/Makefile
+services/evolution-addressbook-factory/Makefile
+services/evolution-calendar-factory/Makefile
+services/evolution-source-registry/Makefile
 tests/Makefile
 tests/libebook/Makefile
 tests/libebook/client/Makefile
@@ -1638,6 +1660,7 @@ docs/reference/camel/Makefile
 docs/reference/libedataserver/Makefile
 docs/reference/libedataserverui/Makefile
 docs/reference/libebackend/Makefile
+docs/reference/private/Makefile
 po/Makefile.in
 vala/Makefile
 ])
@@ -1645,13 +1668,11 @@ AC_OUTPUT
 
 echo "
        evolution-data-server has been configured as follows:
-       Calendar:               $msg_calendar
        Weather calendar:       $use_gweather
        Mail Directory:         $system_mail_dir, $system_mail_perm
        LDAP support:           $msg_ldap
        NNTP support:           $msg_nntp
        Kerberos 5:             $msg_krb5
-       SSL support:            $msg_ssl
        SMIME support:          $msg_smime
        IPv6 support:           $msg_ipv6
        Dot Locking:            $msg_dot
@@ -1661,4 +1682,5 @@ echo "
        Introspection:          $enable_introspection
        Vala bindings:          $enable_vala_bindings
        GNOME Online Accounts   $enable_goa
+       Code coverage (gcov):   $enable_code_coverage
 "