From 0499e9106594fbb3e0bb0f70f0d1e627b3a5ca5d Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Tue, 30 Mar 2010 19:41:14 +0530 Subject: Update version for 2.30.0.1 release --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7ca9a3f394..bb1a2f8819 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [2]) m4_define([evo_minor_version], [30]) -m4_define([evo_micro_version], [0]) +m4_define([evo_micro_version], [0.1]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], @@ -37,7 +37,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Required Packages m4_define([glib_minimum_version], [2.22.0]) m4_define([gtk_minimum_version], [2.18.0]) -m4_define([eds_minimum_version], [evo_version]) +m4_define([eds_minimum_version], [2.30.0]) m4_define([gnome_icon_theme_minimum_version], [2.19.91]) m4_define([gnome_desktop_minimum_version], [2.26.0]) m4_define([libgtkhtml_minimum_version], [3.29.6]) -- cgit From 263d58578d3203df383b4fd8ce6a91897fdb937e Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Tue, 30 Mar 2010 19:43:44 +0530 Subject: post release version bump --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index bb1a2f8819..61bee0fc91 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [2]) m4_define([evo_minor_version], [30]) -m4_define([evo_micro_version], [0.1]) +m4_define([evo_micro_version], [1]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], @@ -14,7 +14,7 @@ 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=2.30 -m4_define([base_version], [2.30]) +m4_define([base_version], [evo_version]) dnl Upgrade Revision: This is for triggering migration calls between dnl varying versions. Reset to 0 whenever BASE_VERSION changes. -- cgit From 7718f55de9190e6f3ef53879763bce3ba1b4b747 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 16 Mar 2010 21:16:39 +0000 Subject: Add a bunch of mail autoconfiguration files These come from http://live.mozillamessaging.com/autoconfig/ Signed-off-by: Federico Mena Quintero Conflicts: capplet/settings/Makefile.am --- configure.ac | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 61bee0fc91..c5f630725b 100644 --- a/configure.ac +++ b/configure.ac @@ -1743,6 +1743,7 @@ smime/gui/Makefile sounds/Makefile capplet/Makefile capplet/settings/Makefile +capplet/settings/mail-autoconfig/Makefile evolution-zip evolution-calendar.pc evolution-mail.pc -- cgit From b674497bccae2ec2ac914714d34961a9517a8aa7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 20 Mar 2010 11:38:33 -0400 Subject: Convert NetworkManager integration to an EShell extension. This demonstrates how to extend EShell without having to modify and recompile e-shell.c. If NetworkManager integration is enabled, the extension is loaded automatically when the EShell is created. The same pattern can be applied to integrate other network monitoring software like ConnMan or Microsoft's Wireless Zero Configuration. --- configure.ac | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c5f630725b..7e88758f1e 100644 --- a/configure.ac +++ b/configure.ac @@ -1133,18 +1133,14 @@ AC_ARG_ENABLE([nm], AC_MSG_CHECKING([if NetworkManager support is enabled]) AC_MSG_RESULT([$enable_nm]) if test "$enable_nm" = yes; then - PKG_CHECK_MODULES([NM], [NetworkManager >= nm_minimum_version], - [NM_SUPPORT="yes"], - [AC_MSG_ERROR([NetworkManager not found (or version < nm_minimum_version)! - If you want to disable NetworkManager, please append --disable-nm to configure!])]) - AC_DEFINE(NM_SUPPORT, 1, [network manager available]) + PKG_CHECK_MODULES([NM], [NetworkManager >= nm_minimum_version],, + [AC_MSG_ERROR([NetworkManager not found (or version < nm_minimum_version). + If you want to disable NetworkManager, please append --disable-nm to configure.])]) AC_SUBST(HAVE_NM) AC_SUBST(NM_CFLAGS) -else - NM_SUPPORT="no" fi -AM_CONDITIONAL([NM_SUPPORT], [test "$NM_SUPPORT" = yes]) +AM_CONDITIONAL([ENABLE_NETWORK_MANAGER], [test "$enable_nm" = yes]) dnl ****************************** dnl Camel Flags @@ -1693,6 +1689,7 @@ modules/Makefile modules/addressbook/Makefile modules/calendar/Makefile modules/mail/Makefile +modules/network-manager/Makefile modules/plugin-lib/Makefile modules/plugin-mono/Makefile modules/plugin-python/Makefile @@ -1763,7 +1760,7 @@ fi echo " LDAP support: $msg_ldap - NetworkManager: $NM_SUPPORT + NetworkManager: $enable_nm Pilot conduits: $msg_pilot Libnotify: $HAVE_LIBNOTIFY Kerberos 5: $msg_krb5 -- cgit From 6416086f149ee7d3f267bd67d3019ef26122c07a Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Wed, 24 Mar 2010 10:24:56 +0000 Subject: Add ConnMan support (words fail me ...) Conflicts: configure.ac modules/Makefile.am --- configure.ac | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7e88758f1e..3b427e0805 100644 --- a/configure.ac +++ b/configure.ac @@ -1139,9 +1139,20 @@ if test "$enable_nm" = yes; then AC_SUBST(HAVE_NM) AC_SUBST(NM_CFLAGS) fi - AM_CONDITIONAL([ENABLE_NETWORK_MANAGER], [test "$enable_nm" = yes]) +dnl ****************************** +dnl Enable ConnMan support ? +dnl ****************************** +AC_ARG_ENABLE([connman], + [AS_HELP_STRING([--enable-connman], + [enable ConnMan support (default=no)])], + [enable_connman=$enableval],[enable_connman=no]) +if test "x$enable_nm$enable_connman" = "xyesyes"; then + AC_MSG_ERROR([It is not possible to enable both ConnMan and NetworkManager]) +fi +AM_CONDITIONAL([ENABLE_CONNMAN], [test "$enable_connman" = yes]) + dnl ****************************** dnl Camel Flags dnl ****************************** @@ -1690,6 +1701,7 @@ modules/addressbook/Makefile modules/calendar/Makefile modules/mail/Makefile modules/network-manager/Makefile +modules/connman/Makefile modules/plugin-lib/Makefile modules/plugin-mono/Makefile modules/plugin-python/Makefile -- cgit From f252d72685e281836fa10c60c01618d627d8c90c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 31 Mar 2010 18:05:32 -0400 Subject: More build fixes. --- configure.ac | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 3b427e0805..7701a76003 100644 --- a/configure.ac +++ b/configure.ac @@ -69,6 +69,7 @@ AS_COMPILER_FLAGS(WARNING_FLAGS, -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED + -DEDS_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -Wall -Wextra -- cgit From cd7fadfcdbbf983dbee379d55bd8a6e44351e8fa Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 20 Mar 2010 11:38:33 -0400 Subject: Convert NetworkManager integration to an EShell extension. This demonstrates how to extend EShell without having to modify and recompile e-shell.c. If NetworkManager integration is enabled, the extension is loaded automatically when the EShell is created. The same pattern can be applied to integrate other network monitoring software like ConnMan or Microsoft's Wireless Zero Configuration. --- configure.ac | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 61bee0fc91..3f3a2bbef7 100644 --- a/configure.ac +++ b/configure.ac @@ -1133,18 +1133,14 @@ AC_ARG_ENABLE([nm], AC_MSG_CHECKING([if NetworkManager support is enabled]) AC_MSG_RESULT([$enable_nm]) if test "$enable_nm" = yes; then - PKG_CHECK_MODULES([NM], [NetworkManager >= nm_minimum_version], - [NM_SUPPORT="yes"], - [AC_MSG_ERROR([NetworkManager not found (or version < nm_minimum_version)! - If you want to disable NetworkManager, please append --disable-nm to configure!])]) - AC_DEFINE(NM_SUPPORT, 1, [network manager available]) + PKG_CHECK_MODULES([NM], [NetworkManager >= nm_minimum_version],, + [AC_MSG_ERROR([NetworkManager not found (or version < nm_minimum_version). + If you want to disable NetworkManager, please append --disable-nm to configure.])]) AC_SUBST(HAVE_NM) AC_SUBST(NM_CFLAGS) -else - NM_SUPPORT="no" fi -AM_CONDITIONAL([NM_SUPPORT], [test "$NM_SUPPORT" = yes]) +AM_CONDITIONAL([ENABLE_NETWORK_MANAGER], [test "$enable_nm" = yes]) dnl ****************************** dnl Camel Flags @@ -1693,6 +1689,7 @@ modules/Makefile modules/addressbook/Makefile modules/calendar/Makefile modules/mail/Makefile +modules/network-manager/Makefile modules/plugin-lib/Makefile modules/plugin-mono/Makefile modules/plugin-python/Makefile @@ -1762,7 +1759,7 @@ fi echo " LDAP support: $msg_ldap - NetworkManager: $NM_SUPPORT + NetworkManager: $enable_nm Pilot conduits: $msg_pilot Libnotify: $HAVE_LIBNOTIFY Kerberos 5: $msg_krb5 -- cgit From d358da9481a125e7eefa80cde88a6bed0c1b7fc3 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 23 Mar 2010 18:54:37 +0100 Subject: [win32] Implement network status detection The implementation is done using System Event Notification Service by implementing ConnectionMade ConnectionMadeNoQOCInfo and ConnectionLost methods of ISensNetwork interface. Make the subscription to the network status notification receive the event only if the ownerof the subscription is logged on to the same computer as the publisher. This makes this module work on Windows Vista and Windows 7 with normal user account. Don't try to build Windows SENS when not building for Windows. Extract the relevant COM structs and typedefs from mingw-w64 headers to allow to build the module with mingw.org toolchain and fix build breakages with Microsoft compilers. --- configure.ac | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 3f3a2bbef7..882dd1d3a8 100644 --- a/configure.ac +++ b/configure.ac @@ -1142,6 +1142,42 @@ fi AM_CONDITIONAL([ENABLE_NETWORK_MANAGER], [test "$enable_nm" = yes]) +dnl ****************************** +dnl Check for Windows SENS API +dnl ****************************** +AC_ARG_ENABLE([sens], + [AS_HELP_STRING([--enable-sens], + [enable Windows SENS support (default=yes)])], + [enable_sens=$enableval],[enable_sens=yes]) +if test "x$os_win32" = xyes; then + if test "x$enable_sens" = xyes; then + AC_CHECK_HEADER([rpc.h],[ enable_sens="yes" ],[ enable_sens="no" ]) + fi +else + enable_sens="no" +fi +AC_MSG_CHECKING([if Windows SENS support is enabled]) +AC_MSG_RESULT([$enable_sens]) +if test "$enable_sens" = yes; then + SENS_LIBS="-lole32 -loleaut32 -luuid -lrpcrt4" + AC_CHECK_HEADER([eventsys.h], + [AC_DEFINE([HAVE_EVENTSYS_H], 1, [Have ])],, + [[ #if HAVE_EVENTSYS_H + #include + #endif + ]]) + AC_CHECK_HEADER([sensevts.h], + [AC_DEFINE([HAVE_SENSEVTS_H], 1, [Have ])],, + [[ #if HAVE_SENSEVTS_H + #include + #endif + ]]) + AC_SUBST(HAVE_SENS) + AC_SUBST(SENS_LIBS) +fi + +AM_CONDITIONAL([ENABLE_WINDOWS_SENS], [test "$enable_sens" = yes]) + dnl ****************************** dnl Camel Flags dnl ****************************** @@ -1693,6 +1729,7 @@ modules/network-manager/Makefile modules/plugin-lib/Makefile modules/plugin-mono/Makefile modules/plugin-python/Makefile +modules/windows-sens/Makefile plugins/Makefile plugins/addressbook-file/Makefile plugins/attachment-reminder/Makefile @@ -1760,6 +1797,7 @@ fi echo " LDAP support: $msg_ldap NetworkManager: $enable_nm + Windows SENS: $enable_sens Pilot conduits: $msg_pilot Libnotify: $HAVE_LIBNOTIFY Kerberos 5: $msg_krb5 -- cgit From ad1de0aa0889edaa0ad9bc41c170fa84ec5536f2 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Apr 2010 10:13:18 +0200 Subject: Bug #589393 - Configure fails to detect pilot-link utf8 capabilities --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 882dd1d3a8..bb82419c13 100644 --- a/configure.ac +++ b/configure.ac @@ -656,8 +656,8 @@ if test "x$enable_pilot_conduits" = "xyes"; then CFLAGS_save="$CFLAGS" CFLAGS="$CFLAGS $GNOME_PILOT_CFLAGS" - LDFLAGS_save="$LDFLAGS" - LDFLAGS="$GNOME_PILOT_LIBS $LDFLAGS" + LIBS_save="$LIBS" + LIBS="$LIBS $GNOME_PILOT_LIBS $LDFLAGS" AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions],[ac_cv_pilot_link_utf8], AC_RUN_IFELSE([AC_LANG_SOURCE( @@ -677,7 +677,7 @@ if test "x$enable_pilot_conduits" = "xyes"; then )],[ac_cv_pilot_link_utf8=yes],[ac_cv_pilot_link_utf8=no],[ac_cv_pilot_link_utf8=no])) CFLAGS="$CFLAGS_save" - LDFLAGS="$LDFLAGS_save" + LIBS="$LIBS_save" if test "$ac_cv_pilot_link_utf8" = no; then AC_MSG_ERROR([evolution requires pilot-link to have working UTF-8 conversion routines]) -- cgit From 04343e5f7081f8ad90d24bbd2a39878cf2c79cd5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 26 Apr 2010 00:56:17 -0400 Subject: Post-release version bump. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index bb82419c13..e00ed98785 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [2]) m4_define([evo_minor_version], [30]) -m4_define([evo_micro_version], [1]) +m4_define([evo_micro_version], [2]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit From b88f08c89936a9b8cc39450a3f71fb79acd752de Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Mon, 26 Apr 2010 10:46:51 +0200 Subject: Fixing a packaging mess due to a typo in configure.ac --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index e00ed98785..052f303624 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ 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=2.30 -m4_define([base_version], [evo_version]) +m4_define([base_version], [2.30]) dnl Upgrade Revision: This is for triggering migration calls between dnl varying versions. Reset to 0 whenever BASE_VERSION changes. @@ -37,7 +37,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Required Packages m4_define([glib_minimum_version], [2.22.0]) m4_define([gtk_minimum_version], [2.18.0]) -m4_define([eds_minimum_version], [2.30.0]) +m4_define([eds_minimum_version], [evo_version]) m4_define([gnome_icon_theme_minimum_version], [2.19.91]) m4_define([gnome_desktop_minimum_version], [2.26.0]) m4_define([libgtkhtml_minimum_version], [3.29.6]) -- cgit From 6ff4b83d33e74a7e564cb87e6376fc71b4c0b163 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 26 Apr 2010 00:56:17 -0400 Subject: Post-release version bump. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 2ee9683026..0d20623295 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [2]) m4_define([evo_minor_version], [30]) -m4_define([evo_micro_version], [1]) +m4_define([evo_micro_version], [2]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit From 06289a56ca3d8144b6a48ef695e98aeaefd77569 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Mon, 26 Apr 2010 10:46:51 +0200 Subject: Fixing a packaging mess due to a typo in configure.ac --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 0d20623295..16a74973c1 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ 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=2.30 -m4_define([base_version], [evo_version]) +m4_define([base_version], [2.30]) dnl Upgrade Revision: This is for triggering migration calls between dnl varying versions. Reset to 0 whenever BASE_VERSION changes. @@ -37,7 +37,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Required Packages m4_define([glib_minimum_version], [2.22.0]) m4_define([gtk_minimum_version], [2.18.0]) -m4_define([eds_minimum_version], [2.30.0]) +m4_define([eds_minimum_version], [evo_version]) m4_define([gnome_icon_theme_minimum_version], [2.19.91]) m4_define([gnome_desktop_minimum_version], [2.26.0]) m4_define([libgtkhtml_minimum_version], [3.29.6]) -- cgit From 8059a6ad3a150f93c950f1027bd3936a66ac73b9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 17 May 2010 15:42:11 -0400 Subject: Bug 617865 - Various data file cleanups - Install evolution-alarm-notify in $(privlibexecdir) instead of $(bindir). - Set the X-GNOME-Bugzilla-Version in evolution-alarm-notify.desktop to @BASE_VERSION@.x (patch was missing the .x suffix). - Killed data/evolution.keys.in.in since it's full of CORBA cruft. The MimeType field in evolution.desktop fills this role now. - Copied the AS_AC_EXPAND macro from gnome-settings-daemon. The macro sets up path-related substitutions for use in automake input files. So for example AS_AC_EXPAND(PRIVLIBEXECDIR, "$privlibexecdir") in configure.ac allows us to use @PRIVLIBEXECDIR@ in .desktop.in files. - Simplified .desktop rules using gnome-settings-daemon as a guide. --- configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 052f303624..ba30c04103 100644 --- a/configure.ac +++ b/configure.ac @@ -1382,6 +1382,9 @@ AC_SUBST(viewsdir) privconduitdir="$privlibdir/conduits" AC_SUBST(privconduitdir) +dnl For evolution-alarm-notify.desktop +AS_AC_EXPAND(PRIVLIBEXECDIR, "$privlibexecdir") + dnl ************************ dnl Plugins dnl ************************ @@ -1646,6 +1649,9 @@ addressbook/tools/csv2vcard addressbook/util/Makefile art/Makefile data/Makefile +data/evolution.desktop.in +data/evolution-alarm-notify.desktop.in +data/evolution-settings.desktop.in data/icons/Makefile doc/Makefile doc/reference/Makefile -- cgit