X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=ca18ea83397c79116c70479fc1f4f939528656cc;hb=HEAD;hp=f510324da5c94aeed27a7f244bb837a34d0a1882;hpb=f9948bbbc46d3256c871982361f2acbb53898a96;p=platform%2Fupstream%2Fevolution-data-server.git

diff --git a/configure.ac b/configure.ac
index f510324..ca18ea8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 
 dnl Evolution-Data-Server version
 m4_define([eds_major_version], [3])
-m4_define([eds_minor_version], [11])
+m4_define([eds_minor_version], [12])
 m4_define([eds_micro_version], [2])
 
 m4_define([eds_version],
@@ -43,8 +43,8 @@ m4_define([gdk_minimum_version], [3.2])
 m4_define([gdk_encoded_version], [GDK_VERSION_3_2])
 
 dnl Keep these two definitions in agreement.
-m4_define([soup_minimum_version], [2.40.3])
-m4_define([soup_encoded_version], [SOUP_VERSION_2_40])
+m4_define([soup_minimum_version], [2.42])
+m4_define([soup_encoded_version], [SOUP_VERSION_2_42])
 
 m4_define([gcr_minimum_version], [3.4])
 m4_define([libsecret_minimum_version], [0.5])
@@ -55,7 +55,7 @@ m4_define([libical_minimum_version], [0.43])
 
 dnl Optional Packages
 m4_define([goa_minimum_version], [3.8])
-m4_define([gweather_minimum_version], [3.5.0])
+m4_define([gweather_minimum_version], [3.8])
 m4_define([libaccounts_glib_minimum_version], [1.4])
 m4_define([libsignon_glib_minimum_version], [1.8])
 
@@ -73,9 +73,9 @@ GLIB_GSETTINGS
 dnl ******************************
 dnl D-Bus versioning
 dnl ******************************
-ADDRESS_BOOK_DBUS_SERVICE_NAME="org.gnome.evolution.dataserver.AddressBook5"
+ADDRESS_BOOK_DBUS_SERVICE_NAME="org.gnome.evolution.dataserver.AddressBook6"
 CALENDAR_DBUS_SERVICE_NAME="org.gnome.evolution.dataserver.Calendar4"
-SOURCES_DBUS_SERVICE_NAME="org.gnome.evolution.dataserver.Sources2"
+SOURCES_DBUS_SERVICE_NAME="org.gnome.evolution.dataserver.Sources3"
 USER_PROMPTER_DBUS_SERVICE_NAME="org.gnome.evolution.dataserver.UserPrompter0"
 
 AC_DEFINE_UNQUOTED(
@@ -130,7 +130,7 @@ LIBEBOOK_CONTACTS_CURRENT=0
 LIBEBOOK_CONTACTS_REVISION=0
 LIBEBOOK_CONTACTS_AGE=0
 
-LIBCAMEL_CURRENT=46
+LIBCAMEL_CURRENT=49
 LIBCAMEL_REVISION=0
 LIBCAMEL_AGE=0
 
@@ -182,13 +182,13 @@ dnl Compiler Warning Flags
 dnl ******************************
 proposed_warning_flags="-Wall -Wextra
 	-Wdeprecated-declarations
-	-Werror-implicit-function-declaration
 	-Wformat-security -Winit-self
 	-Wmissing-declarations -Wmissing-include-dirs
 	-Wmissing-noreturn -Wpointer-arith
 	-Wredundant-decls -Wundef -Wwrite-strings"
 
 proposed_c_warning_flags="$proposed_warning_flags
+	-Werror-implicit-function-declaration
 	-Wdeclaration-after-statement
 	-Wno-missing-field-initializers
 	-Wno-sign-compare
@@ -196,7 +196,7 @@ proposed_c_warning_flags="$proposed_warning_flags
 	-Wnested-externs"
 
 proposed_cxx_warning_flags="$proposed_warning_flags
-	-Wabi -Wnoexcept"
+	-Wabi"
 
 AS_COMPILER_FLAGS(WARNING_FLAGS, [$proposed_c_warning_flags])
 AC_SUBST(WARNING_FLAGS)
@@ -227,31 +227,8 @@ dnl Permits linking of C++ based libraries using the C linker if needed.
 AC_SUBST([predeps_CXX])
 AC_SUBST([postdeps_CXX])
 
-dnl *******************************
-dnl Check for --enable-strict
-dnl *******************************
-AC_ARG_ENABLE([strict],
-	[AS_HELP_STRING([--enable-strict],
-	[enable strict building, like without deprecated symbols (default=auto); auto enables strict building only if .git subdirectory exists])],
-	[enable_strict=$enableval], [enable_strict=auto])
-
-AC_MSG_CHECKING([if strict building is enabled])
-if test "x$enable_strict" = xauto; then
-	dnl Be strict when compiling with .git subdirectory
-	if test -d .git ; then
-		enable_strict=yes
-	else
-		enable_strict=no
-	fi
-fi
-AC_MSG_RESULT([$enable_strict])
-
 AM_CPPFLAGS=
 
-if test "x$enable_strict" = xyes; then
-	AM_CPPFLAGS="$AM_CPPFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
-fi
-
 dnl Warn about API usage that violates our minimum requirements.
 AM_CPPFLAGS="$AM_CPPFLAGS -DGLIB_VERSION_MAX_ALLOWED=glib_encoded_version"
 AM_CPPFLAGS="$AM_CPPFLAGS -DGDK_VERSION_MAX_ALLOWED=gdk_encoded_version"
@@ -322,6 +299,9 @@ dnl This relies on $SED, which is defined in ltmain.sh, which
 dnl is invoked by LT_INIT (at least I think that's how it works).
 GNOME_CODE_COVERAGE
 
+dnl Add the option install unit tests
+EDS_INSTALLED_TESTS
+
 dnl ******************************
 dnl Gtk Doc stuff
 dnl ******************************
@@ -479,6 +459,31 @@ if test "x$enable_gtk" = xyes; then
 fi
 AM_CONDITIONAL(HAVE_GTK, [test x$enable_gtk = xyes])
 
+
+dnl ******************************************
+dnl Check whether to build examples/demos
+dnl ******************************************
+AC_ARG_ENABLE([examples],
+	[AS_HELP_STRING([--enable-examples],
+	[enable the building examples (default=yes)])],
+	[enable_examples=$enableval], [enable_examples=yes])
+AC_MSG_CHECKING([if examples should be built])
+AC_MSG_RESULT([$enable_examples])
+if test "x$enable_examples" = xyes; then
+	PKG_CHECK_MODULES([EXAMPLES],
+		[gtk+-3.0 >= 3.10 glib-2.0 >= 2.38],,
+	[AC_MSG_ERROR([
+	Some packages were not available to build the example program(s).
+
+	If you want to disable examples, please
+	append --disable-examples to configure.
+	])])
+
+	AC_DEFINE(BUILD_EXAMPLES, 1, [Define to 1 if the examples should be built.])
+fi
+AM_CONDITIONAL(BUILD_EXAMPLES, [test x$enable_examples = xyes])
+
+
 dnl *******************************
 dnl Check for GNOME Online Accounts
 dnl *******************************
@@ -599,10 +604,16 @@ dnl ******************************
 AC_ARG_WITH([libdb],
 	AS_HELP_STRING([--with-libdb=PREFIX],
 	[Prefix where libdb is installed]),
-	[libdb_prefix="$withval"], [libdb_prefix='${prefix}'])
-
-DB_CFLAGS="-I$libdb_prefix/include"
-DB_LIBS="-L$libdb_prefix/lib -ldb"
+	[
+		DB_CFLAGS="-I$withval/include"
+		DB_LIBS="-L$withval/lib -ldb"
+	],
+	[
+		if test -z "$DB_CFLAGS" -a -z "$DB_LIBS"; then
+			DB_CFLAGS=""
+			DB_LIBS="-ldb"
+		fi
+	])
 
 AC_MSG_CHECKING([Berkeley DB])
 save_cflags=$CFLAGS; CFLAGS=$DB_CFLAGS
@@ -1292,21 +1303,6 @@ if test "x$use_gweather" = "xyes"; then
 fi
 AM_CONDITIONAL(ENABLE_WEATHER, [test $use_gweather = yes])
 
-dnl ******************************
-dnl NNTP support.
-dnl ******************************
-AC_ARG_ENABLE([nntp],
-	AS_HELP_STRING([--enable-nntp],
-	[Build Usenet news (NNTP) backend]),
-	[enable_nntp=$enableval],[enable_nntp=yes])
-if test "x$enable_nntp" = "xyes"; then
-	AC_DEFINE(ENABLE_NNTP,1,[Build NNTP backend])
-	msg_nntp="yes"
-else
-	msg_nntp="no"
-fi
-AM_CONDITIONAL(ENABLE_NNTP, [test x$enable_nntp = xyes])
-
 AC_DEFINE(HANDLE_LIBICAL_MEMORY, 1, [Define it once memory returned by libical is free'ed properly])
 
 dnl ******************************
@@ -1599,7 +1595,7 @@ fi
 
 AM_CONDITIONAL(ENABLE_LARGEFILE, [test "x$enable_largefile" = "xyes"])
 
-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)
+EVO_SET_COMPILE_FLAGS(CAMEL, gio-2.0 gmodule-2.0 $mozilla_nss $mozilla_nspr sqlite3 >= sqlite_minimum_version, $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $MANUAL_NSPR_CFLAGS $LARGEFILE_CFLAGS, -lz $KRB5_LIBS $MANUAL_NSS_LIBS $MANUAL_NSPR_LIBS)
 AC_SUBST(CAMEL_CFLAGS)
 AC_SUBST(CAMEL_LIBS)
 
@@ -1769,6 +1765,7 @@ modules/gnome-online-accounts/Makefile
 modules/google-backend/Makefile
 modules/outlook-backend/Makefile
 modules/owncloud-backend/Makefile
+modules/secret-monitor/Makefile
 modules/ubuntu-online-accounts/Makefile
 modules/ubuntu-online-accounts/calendar.service-type.in
 modules/ubuntu-online-accounts/contacts.service-type.in
@@ -1778,6 +1775,7 @@ modules/ubuntu-online-accounts/google-calendar.service.in
 modules/ubuntu-online-accounts/google-contacts.service.in
 modules/ubuntu-online-accounts/google-gmail.service.in
 modules/ubuntu-online-accounts/mail.service-type.in
+modules/ubuntu-online-accounts/windows-live-mail.service.in
 modules/ubuntu-online-accounts/yahoo-calendar.service.in
 modules/ubuntu-online-accounts/yahoo-mail.service.in
 modules/trust-prompt/Makefile
@@ -1805,19 +1803,14 @@ tests/test-server-utils/services/Makefile
 tests/test-server-utils/services/org.gnome.evolution.dataserver.AddressBook.service
 tests/test-server-utils/services/org.gnome.evolution.dataserver.Calendar.service
 tests/test-server-utils/services/org.gnome.evolution.dataserver.Sources.service
+examples/Makefile
+examples/cursor/Makefile
 docs/Makefile
 docs/reference/Makefile
-docs/reference/addressbook/Makefile
-docs/reference/addressbook/libebook/Makefile
-docs/reference/addressbook/libebook-contacts/Makefile
-docs/reference/addressbook/libedata-book/Makefile
-docs/reference/calendar/Makefile
-docs/reference/calendar/libecal/Makefile
-docs/reference/calendar/libedata-cal/Makefile
 docs/reference/camel/Makefile
-docs/reference/libedataserver/Makefile
-docs/reference/libebackend/Makefile
 docs/reference/private/Makefile
+docs/reference/eds/Makefile
+docs/reference/eds/version.xml
 po/Makefile.in
 vala/Makefile
 ])
@@ -1828,7 +1821,6 @@ echo "
 	Weather calendar:	$use_gweather
 	Mail Directory:		$system_mail_dir, $system_mail_perm
 	LDAP support:		$msg_ldap
-	NNTP support:		$msg_nntp
 	Kerberos 5:		$msg_krb5
 	SMIME support:		$msg_smime
 	IPv6 support:		$msg_ipv6
@@ -1843,6 +1835,7 @@ echo "
 	Ubuntu Online Accounts	$enable_uoa
 	Google Contacts		$enable_google
 	GTK+:  			$enable_gtk
+	Examples:  		$enable_examples
 	Code coverage (gcov):	$enable_code_coverage
-	Strict building:	$enable_strict
+	Installed tests:        $enable_installed_tests
 "