From 3eb296c0740db491af70d6317ad5f97949bb427a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 8 Nov 2010 01:02:14 -0500 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 a46fb8d2b1..d4dc2acee0 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], [91]) -m4_define([evo_micro_version], [2]) +m4_define([evo_micro_version], [3]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit v1.2.3 From 5a3773537fa8faaca22dada027ffec12c9345bde Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Mon, 29 Nov 2010 20:26:29 +0530 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 d4dc2acee0..53be44215c 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], [91]) -m4_define([evo_micro_version], [3]) +m4_define([evo_micro_version], [4]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit v1.2.3 From da223fce69fe73305c0ab03abd4f092a72686556 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 13 Dec 2010 13:07:12 +0100 Subject: Bug #616452 - Do not set '-Wl,--no-undefined' on freebsd/openbsd --- configure.ac | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 53be44215c..ea2e5ed5e4 100644 --- a/configure.ac +++ b/configure.ac @@ -175,7 +175,14 @@ dnl -DE_CAL_DISABLE_DEPRECATED AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing" AC_SUBST(AM_CPPFLAGS) -LDFLAGS="$LDFLAGS -Wl,--no-undefined" +case "$host" in +*openbsd*|*freebsd*) + dnl Do not set '-Wl,--no-undefined' on freebsd/openbsd + ;; +*) + LDFLAGS="$LDFLAGS -Wl,--no-undefined" + ;; +esac AC_CANONICAL_HOST AC_DEFINE_UNQUOTED(VERSION_COMMENT, "", [Define if you want a comment appended to the version number]) -- cgit v1.2.3 From bce3640c48e285f4df8652d95e7f311362477ffb Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Mon, 20 Dec 2010 18:26:00 +0530 Subject: Update gtkhtml API version --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ea2e5ed5e4..a84e60abcb 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,7 @@ else CLUTTER_GTK="clutter-gtk-0.10" clutter_gtk_minimum_version="0.10" - GTKHTML="libgtkhtml-3.14" + GTKHTML="libgtkhtml-3.15" GTKHTML_EDITOR="gtkhtml-editor-3.14" GWEATHER="gweather" -- cgit v1.2.3 From e628ec9c59a2cc5b2aecf72ef885b744cabd2537 Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Mon, 20 Dec 2010 20:19:37 +0530 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 a84e60abcb..bdd995da02 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], [91]) -m4_define([evo_micro_version], [4]) +m4_define([evo_micro_version], [5]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit v1.2.3 From 971dac35882ca5e629bd5d0df22d09ebbd236c7e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 22 Dec 2010 19:48:46 -0500 Subject: Temporarily remove GDK_DISABLE_DEPRECATED (again). GTK+ 2.23.3 deprecated gdk_set_sm_client_id(), which is used by eggsmclient-xsmp.c. We'll deal with that after GNOME 3.0. --- configure.ac | 3 --- 1 file changed, 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index bdd995da02..ad66479a2f 100644 --- a/configure.ac +++ b/configure.ac @@ -138,13 +138,10 @@ AM_CONDITIONAL([ENABLE_GTK3], [test "$enable_gtk3" = yes]) dnl ****************************** dnl Compiler Warning Flags dnl ****************************** -dnl GDK_DISABLE_DEPRECATED is excluded until -dnl we can port the GDK drawing code to cairo. AS_COMPILER_FLAGS(WARNING_FLAGS, "-DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED - -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DEDS_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -- cgit v1.2.3 From e80b02e40cd630946e1898b1b988a14e21ee45c4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 8 Jan 2011 21:02:25 -0500 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 ad66479a2f..592e174971 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], [91]) -m4_define([evo_micro_version], [5]) +m4_define([evo_micro_version], [6]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit v1.2.3 From dfc28aa9cefad63fb0fc926ce725f7cad8125cb0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 16 Dec 2010 14:03:25 -0500 Subject: Drop support for gtk+-2.0. --- configure.ac | 155 ++++++++++++++++------------------------------------------- 1 file changed, 41 insertions(+), 114 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 592e174971..192811a0d2 100644 --- a/configure.ac +++ b/configure.ac @@ -36,8 +36,10 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Required Packages m4_define([glib_minimum_version], [2.26.0]) +m4_define([gtk_minimum_version], [2.90.4]) m4_define([eds_minimum_version], [evo_version]) -m4_define([gtkhtml_minimum_version], [3.31.90]) +m4_define([gtkhtml_minimum_version], [3.91.3]) +m4_define([gnome_desktop_minimum_version], [2.91.3]) m4_define([gnome_icon_theme_minimum_version], [2.30.2.1]) m4_define([gconf_minimum_version], [2.0.0]) dnl XXX Just a Guess m4_define([libsoup_minimum_version], [2.4.0]) dnl XXX Just a Guess @@ -45,95 +47,21 @@ m4_define([libxml_minimum_version], [2.7.3]) m4_define([shared_mime_info_minimum_version], [0.22]) m4_define([libpst_minimum_version], [0.6.41]) m4_define([libnotify_minimum_version], [0.5.1]) +m4_define([unique_minimum_version], [2.90.4]) dnl Optional Packages -m4_define([nm_minimum_version],[0.7]) +m4_define([clutter_gtk_minimum_version], [0.90]) m4_define([geoclue_minimum_version], [0.11.1]) m4_define([gladeui_minimum_version], [3.0.0]) +m4_define([gweather_minimum_version], [2.90.0]) +m4_define([libcanberra_gtk_minimum_version], [0.25]) +m4_define([nm_minimum_version], [0.7]) -dnl ********************************** -dnl Gtk-3 compatibility -dnl ********************************** -AC_ARG_ENABLE([gtk3], - AS_HELP_STRING([--enable-gtk3], - [Attempt to use gtk+-3]), - [enable_gtk3=$enableval],[enable_gtk3=no]) - -if test "x${enable_gtk3}" = "xyes"; then - LIBEDATASERVERUI="libedataserverui-3.0" - GTK="gtk+-3.0" - gtk_minimum_version="2.90.4" - - GAIL="gail-3.0" - gail_minimum_version="2.90.4" - - UNIQUE="unique-3.0" - unique_minimum_version="2.90" - - GNOME_DESKTOP="gnome-desktop-3.0" - gnome_desktop_minimum_version="2.90" - - CANBERRA_GTK="libcanberra-gtk3" - libcanberra_gtk_minimum_version="0.25" - - CLUTTER_GTK="clutter-gtk-1.0" - clutter_gtk_minimum_version="0.90" - - GTKHTML="libgtkhtml-4.0" - GTKHTML_EDITOR="gtkhtml-editor-4.0" - - GWEATHER="gweather-3.0" - gweather_minimum_version="2.90.0" - - - dnl XXX These versions don't yet exist. The latest releases - dnl link to gtk+-2.0 so we've bumped the versions to some - dnl bogus value to force some plugins to be disabled. - champlain_minimum_version="0.8" - gtkimageview_minimum_version="2.0" - - EVOLUTION_SHELL="evolution-shell-3.0" -else - LIBEDATASERVERUI="libedataserverui-1.2" - - GTK="gtk+-2.0" - gtk_minimum_version="2.22.0" - - GAIL="gail" - gail_minimum_version="1.9.0" - - UNIQUE="unique-1.0" - unique_minimum_version="1.1.2" - - GNOME_DESKTOP="gnome-desktop-2.0" - gnome_desktop_minimum_version="2.26.0" - - CANBERRA_GTK="libcanberra-gtk" - libcanberra_gtk_minimum_version="0" - - CLUTTER_GTK="clutter-gtk-0.10" - clutter_gtk_minimum_version="0.10" - - GTKHTML="libgtkhtml-3.15" - GTKHTML_EDITOR="gtkhtml-editor-3.14" - - GWEATHER="gweather" - gweather_minimum_version="2.25.3" - - champlain_minimum_version="0.4" - gtkimageview_minimum_version="1.6" - - EVOLUTION_SHELL="evolution-shell" -fi - -AC_SUBST(GTKHTML_EDITOR) -AC_SUBST(GTK) -AC_SUBST(GTKHTML) -AC_SUBST(UNIQUE) -AC_SUBST(GNOME_DESKTOP) -AC_SUBST(LIBEDATASERVERUI) -AC_SUBST(EVOLUTION_SHELL) -AM_CONDITIONAL([ENABLE_GTK3], [test "$enable_gtk3" = yes]) +dnl XXX These versions don't yet exist. The latest releases +dnl link to gtk+-2.0 so we've bumped the versions to some +dnl bogus value to force some plugins to be disabled. +m4_define([champlain_minimum_version], [0.8]) +m4_define([gtkimageview_minimum_version], [2.0]) dnl ****************************** dnl Compiler Warning Flags @@ -307,14 +235,14 @@ dnl Check for base dependencies early. dnl ********************************** PKG_CHECK_MODULES([GNOME_PLATFORM], [gio-2.0 >= glib_minimum_version - cairo-gobject - $GTK >= $gtk_minimum_version - $GAIL >= $gail_minimum_version + cairo-gobject + gtk+-3.0 >= gtk_minimum_version + gail-3.0 >= gtk_minimum_version + unique-3.0 >= unique_minimum_version gconf-2.0 >= gconf_minimum_version libxml-2.0 >= libxml_minimum_version shared-mime-info >= shared_mime_info_minimum_version - $GNOME_DESKTOP >= $gnome_desktop_minimum_version - $UNIQUE >= $unique_minimum_version]) + gnome-desktop-3.0 >= gnome_desktop_minimum_version]) AC_SUBST(GNOME_PLATFORM_CFLAGS) AC_SUBST(GNOME_PLATFORM_LIBS) @@ -322,7 +250,7 @@ PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], [libebook-1.2 >= eds_minimum_version libecal-1.2 >= eds_minimum_version libedataserver-1.2 >= eds_minimum_version - $LIBEDATASERVERUI >= eds_minimum_version + libedataserverui-3.0 >= eds_minimum_version libegroupwise-1.2 >= eds_minimum_version libebackend-1.2 >= eds_minimum_version]) @@ -336,7 +264,7 @@ AC_ARG_ENABLE([canberra], [enable_canberra="$enableval"], [enable_canberra=yes]) if test $enable_canberra = yes; then - PKG_CHECK_MODULES([CANBERRA],[$CANBERRA_GTK >= $libcanberra_gtk_minimum_version]) + PKG_CHECK_MODULES([CANBERRA],[libcanberra-gtk3 >= libcanberra_gtk_minimum_version]) AC_DEFINE(HAVE_CANBERRA, 1, [Define if using Canberra and Canberra-GTK for sound]) fi AC_SUBST(CANBERRA_CFLAGS) @@ -662,7 +590,7 @@ AC_ARG_WITH([clutter], AC_MSG_RESULT($with_clutter) if test "x$with_clutter" = "xyes"; then - PKG_CHECK_MODULES(CLUTTER, [mx-1.0 $CLUTTER_GTK >= $clutter_gtk_minimum_version clutter-1.0 >= 1.0.0]) + PKG_CHECK_MODULES(CLUTTER, [mx-1.0 clutter-gtk-1.0 >= clutter_gtk_minimum_version clutter-1.0 >= 1.0.0]) AC_DEFINE(HAVE_CLUTTER, 1, [Clutter available]) AM_CONDITIONAL(ENABLE_CLUTTER, true) @@ -750,7 +678,7 @@ dnl ************************* dnl GTKHTML check dnl XXX Drop the version from the package name? dnl ************************* -PKG_CHECK_MODULES([GTKHTML], [$GTKHTML >= gtkhtml_minimum_version]) +PKG_CHECK_MODULES([GTKHTML], [libgtkhtml-4.0 >= gtkhtml_minimum_version]) AC_SUBST(GTKHTML_CFLAGS) AC_SUBST(GTKHTML_LIBS) @@ -1274,7 +1202,7 @@ dnl (which are dragged in through libedataserverui), as both dnl gnutls and mozilla-nss have a header called "pkcs12.h" which is dnl included in smime/lib/e-pkcs12.c. It wants the Mozilla NSS one. dnl -EVO_SET_COMPILE_FLAGS(CERT_UI, $LIBEDATASERVERUI) +EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-3.0) CERT_UI_CFLAGS="$MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS $CERT_UI_CFLAGS" CERT_UI_LIBS="$MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS $CERT_UI_LIBS" AC_SUBST(CERT_UI_CFLAGS) @@ -1283,7 +1211,7 @@ AC_SUBST(CERT_UI_LIBS) dnl ************ dnl E_UTIL Flags dnl ************ -EVO_SET_COMPILE_FLAGS(E_UTIL, $LIBEDATASERVERUI camel-provider-1.2 $mozilla_nspr, $MANUAL_NSPR_CFLAGS $MANUAL_NSPR_LIBS) +EVO_SET_COMPILE_FLAGS(E_UTIL, libedataserverui-3.0 camel-provider-1.2 $mozilla_nspr, $MANUAL_NSPR_CFLAGS $MANUAL_NSPR_LIBS) AC_SUBST(E_UTIL_CFLAGS) AC_SUBST(E_UTIL_LIBS) @@ -1299,14 +1227,14 @@ AC_SUBST(TZDIALOG_LIBS) dnl *************** dnl E_WIDGETS Flags dnl *************** -EVO_SET_COMPILE_FLAGS(E_WIDGETS, $LIBEDATASERVERUI $GTKHTML_EDITOR) +EVO_SET_COMPILE_FLAGS(E_WIDGETS, libedataserverui-3.0 gtkhtml-editor-4.0) AC_SUBST(E_WIDGETS_CFLAGS) AC_SUBST(E_WIDGETS_LIBS) dnl *************** dnl IMPORTERS Flags dnl *************** -EVO_SET_COMPILE_FLAGS(IMPORTERS, $LIBEDATASERVERUI camel-provider-1.2 libebook-1.2) +EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-3.0 camel-provider-1.2 libebook-1.2) AC_SUBST(IMPORTERS_CFLAGS) AC_SUBST(IMPORTERS_LIBS) @@ -1320,14 +1248,14 @@ AC_SUBST(LIBFILTER_LIBS) dnl *********** dnl Shell Flags dnl *********** -EVO_SET_COMPILE_FLAGS(SHELL, $GTKHTML $LIBEDATASERVERUI) +EVO_SET_COMPILE_FLAGS(SHELL, libgtkhtml-4.0 libedataserverui-3.0) AC_SUBST(SHELL_CFLAGS) AC_SUBST(SHELL_LIBS) dnl ***************** dnl Addressbook Flags dnl ***************** -EVOLUTION_ADDRESSBOOK_DEPS="$GTKHTML libebook-1.2 $LIBEDATASERVERUI camel-1.2 $GTKHTML_EDITOR" +EVOLUTION_ADDRESSBOOK_DEPS="libgtkhtml-4.0 libebook-1.2 libedataserverui-3.0 camel-1.2 gtkhtml-editor-4.0" EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS) AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS) @@ -1362,7 +1290,7 @@ EVO_SET_COMPILE_FLAGS(GDATA, libgdata >= 0.4.0) AC_SUBST(GDATA_CFLAGS) AC_SUBST(GDATA_LIBS) -EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $GTKHTML libebook-1.2 libecal-1.2 $LIBEDATASERVERUI libebackend-1.2 $libnotify $GTKHTML_EDITOR) +EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgtkhtml-4.0 libebook-1.2 libecal-1.2 libedataserverui-3.0 libebackend-1.2 $libnotify gtkhtml-editor-4.0) AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) AC_SUBST(EVOLUTION_CALENDAR_LIBS) @@ -1383,7 +1311,7 @@ AC_MSG_RESULT([$ac_cv_have_iuth]) dnl ********** dnl Mail Flags dnl ********** -EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-1.2 $GTKHTML $GTKHTML_EDITOR $mozilla_nss libebook-1.2 $LIBEDATASERVERUI) +EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-1.2 libgtkhtml-4.0 gtkhtml-editor-4.0 $mozilla_nss libebook-1.2 libedataserverui-3.0) AC_SUBST(EVOLUTION_MAIL_CFLAGS) AC_SUBST(EVOLUTION_MAIL_LIBS) @@ -1397,9 +1325,9 @@ dnl ***************** dnl EggSMClient Flags dnl ***************** if test "x$os_win32" = "xyes"; then - EVO_SET_COMPILE_FLAGS(EGG_SMCLIENT, $GTK) + EVO_SET_COMPILE_FLAGS(EGG_SMCLIENT, gtk+-3.0) else - EVO_SET_COMPILE_FLAGS(EGG_SMCLIENT, $GTK,, -lSM -lICE) + EVO_SET_COMPILE_FLAGS(EGG_SMCLIENT, gtk+-3.0,, -lSM -lICE) fi AC_SUBST(EGG_SMCLIENT_CFLAGS) AC_SUBST(EGG_SMCLIENT_LIBS) @@ -1542,7 +1470,7 @@ AC_ARG_ENABLE([weather], [enable_weather="$enableval"],[enable_weather=yes]) if test "x$enable_weather" = "xyes"; then - PKG_CHECK_MODULES([LIBGWEATHER], $GWEATHER >= $gweather_minimum_version, + PKG_CHECK_MODULES([GWEATHER], gweather-3.0 >= gweather_minimum_version, have_weather="yes", have_weather="no") AC_SUBST(GWEATHER_CFLAGS) AC_SUBST(GWEATHER_LIBS) @@ -1550,7 +1478,7 @@ if test "x$enable_weather" = "xyes"; then if test "x$have_weather" = "xyes"; then plugins_base="$plugins_base calendar-weather" else - AC_MSG_ERROR([$GWEATHER >= $gweather_minimum_version is required for the calendar-weather plugin. Use --disable-weather to exclude the plugin.]) + AC_MSG_ERROR([gweather-3.0 >= gweather_minimum_version is required for the calendar-weather plugin. Use --disable-weather to exclude the plugin.]) fi fi @@ -1566,15 +1494,15 @@ if test "x$enable_plugins" = "xexperimental"; then [enable_contacts_map="$enableval"], [enable_contacts_map=yes]) if test "x$enable_contacts_map" = "xyes"; then - PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.5 >= $champlain_minimum_version], [have_champlain=yes], [have_champlain=no]) + PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.5 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no]) if test "x$have_champlain" = "xno"; then - PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.4 >= $champlain_minimum_version], [have_champlain=yes], [have_champlain=no]) + PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.4 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no]) fi AC_SUBST(CHAMPLAIN_CFLAGS) AC_SUBST(CHAMPLAIN_LIBS) if test "x$have_champlain" = "xno"; then - AC_MSG_ERROR([champlain-gtk >= $champlain_minimum_version is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.]) + AC_MSG_ERROR([champlain-gtk >= champlain_minimum_version is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.]) fi PKG_CHECK_MODULES([GEOCLUE], [geoclue >= geoclue_minimum_version], [have_geoclue=yes], [have_geoclue=no]) @@ -1585,10 +1513,10 @@ if test "x$enable_plugins" = "xexperimental"; then AC_MSG_ERROR([geoclue is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.]) fi - PKG_CHECK_MODULES( [CLUTTER_GTK], [$CLUTTER_GTK >= $clutter_gtk_minimum_version], [have_clutter_gtk="yes"], [have_clutter_gtk="no"] ) + PKG_CHECK_MODULES([CLUTTER_GTK], [clutter-gtk-1.0 >= clutter_gtk_minimum_version], [have_clutter_gtk="yes"], [have_clutter_gtk="no"] ) if test "x$have_clutter_gtk" = "xno"; then - AC_MSG_ERROR([$CLUTTER_GTK is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.]) + AC_MSG_ERROR([clutter-gtk-1.0 is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.]) fi plugins_standard="$plugins_standard contacts-map" @@ -1604,14 +1532,14 @@ AC_ARG_ENABLE([image-inline], [enable_image_inline="$enableval"], [enable_image_inline=yes]) if test "x$enable_image_inline" = "xyes"; then - PKG_CHECK_MODULES(GTKIMAGEVIEW, gtkimageview >= $gtkimageview_minimum_version, have_imageview=yes, have_imageview=no) + PKG_CHECK_MODULES(GTKIMAGEVIEW, gtkimageview >= gtkimageview_minimum_version, have_imageview=yes, have_imageview=no) AC_SUBST(GTKIMAGEVIEW_CFLAGS) AC_SUBST(GTKIMAGEVIEW_LIBS) if test "x$have_imageview" = "xyes"; then plugins_standard="$plugins_standard image-inline" else - AC_MSG_ERROR([gtkimageview >= $gtkimageview_minimum_version is required for the image-inline plugin. Use --disable-image-inline to exclude the plugin.]) + AC_MSG_ERROR([gtkimageview >= gtkimageview_minimum_version is required for the image-inline plugin. Use --disable-image-inline to exclude the plugin.]) fi fi @@ -1891,7 +1819,6 @@ echo " fi echo " - GTK+ package: $GTK LDAP support: $msg_ldap Clutter support: $with_clutter NetworkManager: $enable_nm -- cgit v1.2.3 From 19bc6fd37009cdbf99ed9f5d15714a416af51654 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 29 Oct 2010 23:04:32 -0400 Subject: Not gonna deal with deprecated API in GTK3 just yet. --- configure.ac | 1 - 1 file changed, 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 192811a0d2..8f0b338862 100644 --- a/configure.ac +++ b/configure.ac @@ -70,7 +70,6 @@ AS_COMPILER_FLAGS(WARNING_FLAGS, "-DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED - -DGTK_DISABLE_DEPRECATED -DEDS_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -- cgit v1.2.3 From 1e2cebaa826522b90393979cab52e572cf5e146a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 26 Jan 2011 13:23:37 -0500 Subject: Require the latest gtk+-3.0 release until 3.0. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8f0b338862..32f7373591 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Required Packages m4_define([glib_minimum_version], [2.26.0]) -m4_define([gtk_minimum_version], [2.90.4]) +m4_define([gtk_minimum_version], [2.99.2]) m4_define([eds_minimum_version], [evo_version]) m4_define([gtkhtml_minimum_version], [3.91.3]) m4_define([gnome_desktop_minimum_version], [2.91.3]) -- cgit v1.2.3 From 8fade835168c511a89813019aef6d0ee02d63b5d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 28 Jan 2011 17:31:21 +0100 Subject: gladeui is 2.0 now --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 32f7373591..006636c88c 100644 --- a/configure.ac +++ b/configure.ac @@ -1633,7 +1633,7 @@ AC_ARG_WITH([glade-catalog], [(for maintainers only) [default=no]])], [with_catalog="$withval"], [with_catalog="no"]) if test "$with_catalog" = "yes"; then - PKG_CHECK_MODULES(GLADEUI, [gladeui-1.0 >= gladeui_minimum_version]) + PKG_CHECK_MODULES(GLADEUI, [gladeui-2.0 >= gladeui_minimum_version]) fi AM_CONDITIONAL(GLADE_CATALOG, test "x$with_catalog" != "xno") -- cgit v1.2.3 From e1fc0c715e394bf9e97ef328d1bdecee78e2f2a3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 30 Jan 2011 22:58:48 -0500 Subject: libchamplain-0.8 exists now. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 006636c88c..9d3837f801 100644 --- a/configure.ac +++ b/configure.ac @@ -50,6 +50,7 @@ m4_define([libnotify_minimum_version], [0.5.1]) m4_define([unique_minimum_version], [2.90.4]) dnl Optional Packages +m4_define([champlain_minimum_version], [0.8]) m4_define([clutter_gtk_minimum_version], [0.90]) m4_define([geoclue_minimum_version], [0.11.1]) m4_define([gladeui_minimum_version], [3.0.0]) @@ -60,7 +61,6 @@ m4_define([nm_minimum_version], [0.7]) dnl XXX These versions don't yet exist. The latest releases dnl link to gtk+-2.0 so we've bumped the versions to some dnl bogus value to force some plugins to be disabled. -m4_define([champlain_minimum_version], [0.8]) m4_define([gtkimageview_minimum_version], [2.0]) dnl ****************************** -- cgit v1.2.3 From a6604fe22f5593911476e708f0496f3f88f1c93d Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Mon, 31 Jan 2011 18:27:08 +0530 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 9d3837f801..787f197e72 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], [91]) -m4_define([evo_micro_version], [6]) +m4_define([evo_micro_version], [90]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit v1.2.3 From 1997f5cf6d478f2c7162b1b80699b165d0161ddc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 2 Feb 2011 09:34:50 -0500 Subject: Fix champlain-gtk checks in configure.ac. Check for champlain-gtk-0.8 not 0.5, and drop the fallback to 0.4. --- configure.ac | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 787f197e72..f083996c5e 100644 --- a/configure.ac +++ b/configure.ac @@ -1493,15 +1493,12 @@ if test "x$enable_plugins" = "xexperimental"; then [enable_contacts_map="$enableval"], [enable_contacts_map=yes]) if test "x$enable_contacts_map" = "xyes"; then - PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.5 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no]) - if test "x$have_champlain" = "xno"; then - PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.4 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no]) - fi + PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.8 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no]) AC_SUBST(CHAMPLAIN_CFLAGS) AC_SUBST(CHAMPLAIN_LIBS) if test "x$have_champlain" = "xno"; then - AC_MSG_ERROR([champlain-gtk >= champlain_minimum_version is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.]) + AC_MSG_ERROR([champlain-gtk-0.8 >= champlain_minimum_version is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.]) fi PKG_CHECK_MODULES([GEOCLUE], [geoclue >= geoclue_minimum_version], [have_geoclue=yes], [have_geoclue=no]) -- cgit v1.2.3 From 753ce802e32dacd4fc23bf561d5590d71ab6f529 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 2 Feb 2011 09:36:52 -0500 Subject: Bump gtk_minimum_version to 2.99.3. The actual requirement right now is git HEAD, but this is the best we can do with pkg-config. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f083996c5e..0181d407b4 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Required Packages m4_define([glib_minimum_version], [2.26.0]) -m4_define([gtk_minimum_version], [2.99.2]) +m4_define([gtk_minimum_version], [2.99.3]) m4_define([eds_minimum_version], [evo_version]) m4_define([gtkhtml_minimum_version], [3.91.3]) m4_define([gnome_desktop_minimum_version], [2.91.3]) -- cgit v1.2.3 From c49e3012a029bb78dc759a9fc8dfc1103a36d976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 2 Feb 2011 17:07:07 -0500 Subject: Bug 222423 - Support Face headers The configuration section for the Face plugin now has a preview image. Also promoting this plugin out of "experimental" status so more distros will pick it up. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 0181d407b4..50130b7efa 100644 --- a/configure.ac +++ b/configure.ac @@ -1410,12 +1410,12 @@ plugins_base_always="calendar-file calendar-http itip-formatter default-source a plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN" dist_plugins_base="$plugins_base_always calendar-weather sa-junk-plugin bogo-junk-plugin" -plugins_standard_always="bbdb save-calendar mail-to-task mailing-list-actions prefer-plain mail-notification attachment-reminder backup-restore email-custom-header templates vcard-inline dbx-import" +plugins_standard_always="bbdb save-calendar mail-to-task mailing-list-actions prefer-plain mail-notification attachment-reminder backup-restore email-custom-header face templates vcard-inline dbx-import" plugins_standard="$plugins_standard_always" dist_plugins_standard="$plugins_standard audio-inline image-inline pst-import" -plugins_experimental_always="face external-editor" +plugins_experimental_always="external-editor" plugins_experimental="$plugins_experimental_always $TNEF_ATTACHMENTS" dist_plugins_experimental="$plugins_experimental_always profiler tnef-attachments contacts-map" -- cgit v1.2.3 From 718007e847a2731f57c9cd941c3419f343ece8f3 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 7 Feb 2011 12:56:03 +0100 Subject: Bug #634571 - Check for 'mono-2' rather than 'mono' package --- configure.ac | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 50130b7efa..b82ff8efd9 100644 --- a/configure.ac +++ b/configure.ac @@ -690,14 +690,12 @@ dnl ****************************** dnl Mono hooks dnl This should just define mono CFLAGS etc here, it is used later to turn on the mono plugin or not. dnl ****************************** -MONO_CFLAGS= -MONO_LIBS= AC_ARG_ENABLE([mono], AS_HELP_STRING([--enable-mono], [Add Mono embedded hooks.]), [enable_mono=$enableval],[enable_mono=no]) if test "x${enable_mono}" = "xyes"; then - PKG_CHECK_MODULES([MONO], ["mono"]) + PKG_CHECK_MODULES([MONO], ["mono-2"]) AC_DEFINE(ENABLE_MONO,1,[Define if Mono embedding should be enabled]) fi AC_SUBST(MONO_CFLAGS) -- cgit v1.2.3 From 3ac012f0800c1a182de2eb5de06ca0527becc976 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 10 Feb 2011 16:52:25 -0500 Subject: Bump GTK+ requirement to 3.0. This requirement is now locked until GNOME 3.3 development begins. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index b82ff8efd9..6a0aed2663 100644 --- a/configure.ac +++ b/configure.ac @@ -35,8 +35,8 @@ dnl Automake 1.11 - Silent Build Rules m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Required Packages -m4_define([glib_minimum_version], [2.26.0]) -m4_define([gtk_minimum_version], [2.99.3]) +m4_define([glib_minimum_version], [2.28]) +m4_define([gtk_minimum_version], [3.0]) m4_define([eds_minimum_version], [evo_version]) m4_define([gtkhtml_minimum_version], [3.91.3]) m4_define([gnome_desktop_minimum_version], [2.91.3]) -- cgit v1.2.3 From cf41379058d6e78ea138603186acb8174c58e0ca Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 14 Feb 2011 12:32:48 -0500 Subject: Require libsoup-gnome-2.4 instead of libsoup-2.4. So Evolution can utilize GNOME integration features in libsoup. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 6a0aed2663..8a7b907c82 100644 --- a/configure.ac +++ b/configure.ac @@ -1279,7 +1279,7 @@ fi dnl ************** dnl Calendar Flags dnl ************** -EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.4 >= libsoup_minimum_version) +EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-gnome-2.4 >= libsoup_minimum_version) AC_SUBST(LIBSOUP_CFLAGS) AC_SUBST(LIBSOUP_LIBS) -- cgit v1.2.3 From 246851b3333f878e37505df28d01e62cecaf331d Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Mon, 21 Feb 2011 16:59:34 +0530 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 8a7b907c82..393be3ecea 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], [91]) -m4_define([evo_micro_version], [90]) +m4_define([evo_micro_version], [91]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit v1.2.3 From 7130c5017e54bb355636164731f105749eac4eed Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 5 Mar 2011 12:41:40 -0500 Subject: Bump BASE_VERSION to 3.0. Looks like GNOME 3.0 might actually happen this cycle. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 393be3ecea..9a2c81bb27 100644 --- a/configure.ac +++ b/configure.ac @@ -13,8 +13,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=2.92 -m4_define([base_version], [2.92]) +BASE_VERSION=3.0 +m4_define([base_version], [3.0]) dnl Upgrade Revision: This is for triggering migration calls between dnl varying versions. Reset to 0 whenever BASE_VERSION changes. -- cgit v1.2.3 From 2f92d9aea39b38cc441d4e9fdd918fccae77eb5a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 6 Mar 2011 10:42:38 -0500 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 9a2c81bb27..cc7a788f70 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], [91]) -m4_define([evo_micro_version], [91]) +m4_define([evo_micro_version], [92]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit v1.2.3 From 5bcf04619f76183562f0649c66e7d22a7be5b35e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 8 Mar 2011 07:39:47 -0500 Subject: Bug 644166 - Add style class to primary toolbars Requires GTK+ >= 3.0.2 since GTK_STYLE_CLASS_PRIMARY_TOOLBAR is a very recent addition. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index cc7a788f70..8d68aca982 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Required Packages m4_define([glib_minimum_version], [2.28]) -m4_define([gtk_minimum_version], [3.0]) +m4_define([gtk_minimum_version], [3.0.2]) m4_define([eds_minimum_version], [evo_version]) m4_define([gtkhtml_minimum_version], [3.91.3]) m4_define([gnome_desktop_minimum_version], [2.91.3]) -- cgit v1.2.3 From 2f969117444bf2403b3b749a0154448674eeed31 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 21 Mar 2011 11:11:14 -0400 Subject: Post-release version bump. --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8d68aca982..96d43ef63c 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], [91]) -m4_define([evo_micro_version], [92]) +m4_define([evo_major_version], [3]) +m4_define([evo_minor_version], [0]) +m4_define([evo_micro_version], [0]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit v1.2.3 From f272b2c090237a30a54dde2bed7f57069ad52ef5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 21 Mar 2011 15:01:12 -0400 Subject: Begin Evolution 3.1 development. --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 96d43ef63c..5857c1d5df 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Evolution Versions m4_define([evo_major_version], [3]) -m4_define([evo_minor_version], [0]) +m4_define([evo_minor_version], [1]) m4_define([evo_micro_version], [0]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) @@ -13,8 +13,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.0 -m4_define([base_version], [3.0]) +BASE_VERSION=3.2 +m4_define([base_version], [3.2]) dnl Upgrade Revision: This is for triggering migration calls between dnl varying versions. Reset to 0 whenever BASE_VERSION changes. -- cgit v1.2.3 From 617e766a48fa928e450b1717b12b981129e5c1c4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 30 Jan 2011 23:06:01 -0500 Subject: Remove unique-3.0 dependency from configure.ac. --- configure.ac | 2 -- 1 file changed, 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 5857c1d5df..52271f3f33 100644 --- a/configure.ac +++ b/configure.ac @@ -47,7 +47,6 @@ m4_define([libxml_minimum_version], [2.7.3]) m4_define([shared_mime_info_minimum_version], [0.22]) m4_define([libpst_minimum_version], [0.6.41]) m4_define([libnotify_minimum_version], [0.5.1]) -m4_define([unique_minimum_version], [2.90.4]) dnl Optional Packages m4_define([champlain_minimum_version], [0.8]) @@ -237,7 +236,6 @@ PKG_CHECK_MODULES([GNOME_PLATFORM], cairo-gobject gtk+-3.0 >= gtk_minimum_version gail-3.0 >= gtk_minimum_version - unique-3.0 >= unique_minimum_version gconf-2.0 >= gconf_minimum_version libxml-2.0 >= libxml_minimum_version shared-mime-info >= shared_mime_info_minimum_version -- cgit v1.2.3 From e076ca2f77d5ecfba4677ad98a876beaed99052e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 27 Mar 2011 11:13:00 -0400 Subject: Bug 644310 - Rework "Set as Background" image option This adds a dependency on gsettings-desktop-schemas >= 2.91.92. The version was chosen for the change from "picture-filename" to "picture-uri" in the "org.gnome.desktop.background" schema. Also, we now save the background image under ~/Pictures since the old directory (~/.gnome2/wallpapers) is presumed deprecated in GNOME 3. --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 52271f3f33..ef69b1bf19 100644 --- a/configure.ac +++ b/configure.ac @@ -41,6 +41,7 @@ m4_define([eds_minimum_version], [evo_version]) m4_define([gtkhtml_minimum_version], [3.91.3]) m4_define([gnome_desktop_minimum_version], [2.91.3]) m4_define([gnome_icon_theme_minimum_version], [2.30.2.1]) +m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92]) m4_define([gconf_minimum_version], [2.0.0]) dnl XXX Just a Guess m4_define([libsoup_minimum_version], [2.4.0]) dnl XXX Just a Guess m4_define([libxml_minimum_version], [2.7.3]) @@ -239,7 +240,8 @@ PKG_CHECK_MODULES([GNOME_PLATFORM], gconf-2.0 >= gconf_minimum_version libxml-2.0 >= libxml_minimum_version shared-mime-info >= shared_mime_info_minimum_version - gnome-desktop-3.0 >= gnome_desktop_minimum_version]) + gnome-desktop-3.0 >= gnome_desktop_minimum_version + gsettings-desktop-schemas >= gsettings_desktop_schemas_minimum_version]) AC_SUBST(GNOME_PLATFORM_CFLAGS) AC_SUBST(GNOME_PLATFORM_LIBS) @@ -251,7 +253,6 @@ PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], libegroupwise-1.2 >= eds_minimum_version libebackend-1.2 >= eds_minimum_version]) - dnl ****************************** dnl Canberra / Canberra-GTK Sound dnl ****************************** -- cgit v1.2.3 From ea8326df3a64c21ddbcacad5941648b1a86bc7e2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 28 Mar 2011 15:53:39 -0400 Subject: Remove the profiler plugin. This plugin was for developers, but no one uses it anymore. Plus the only profiling hooks left in Evolution were in the MessageList widget, which performs fine. There's better ways to collect profiling data these days anyway (sysprof, systemtap, etc.). --- configure.ac | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ef69b1bf19..6b3bc14912 100644 --- a/configure.ac +++ b/configure.ac @@ -1415,22 +1415,7 @@ dist_plugins_standard="$plugins_standard audio-inline image-inline pst-import" plugins_experimental_always="external-editor" plugins_experimental="$plugins_experimental_always $TNEF_ATTACHMENTS" -dist_plugins_experimental="$plugins_experimental_always profiler tnef-attachments contacts-map" - -dnl ****************************** -dnl Profiling support -dnl ****************************** -AC_ARG_ENABLE([profiling], - AS_HELP_STRING([--enable-profiling], - [Enable profiling plugin.]), - [enable_profiling=$enableval],[enable_profiling=no]) - -case x"$enable_profiling" in -x | xyes) - plugins_experimental="$plugins_experimental profiler" - AC_DEFINE(ENABLE_PROFILING,1,[Profiling Hooks Enabled]) - ;; -esac +dist_plugins_experimental="$plugins_experimental_always tnef-attachments contacts-map" dnl ****************************************************************** dnl The following plugins have additional library dependencies. @@ -1776,7 +1761,6 @@ plugins/mail-to-task/Makefile plugins/mailing-list-actions/Makefile plugins/mark-all-read/Makefile plugins/prefer-plain/Makefile -plugins/profiler/Makefile plugins/pst-import/Makefile plugins/publish-calendar/Makefile plugins/sa-junk-plugin/Makefile -- cgit v1.2.3 From 436b052cbfa72898c2d9809b48554a0ec433d90a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 30 Mar 2011 11:12:05 -0400 Subject: Bug 646200 - Insufficient requirement on libsoup Require libsoup >= 2.31.2 so we can use the get methods for SoupCookie, SoupData and SoupURI. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 6b3bc14912..0bbe968ace 100644 --- a/configure.ac +++ b/configure.ac @@ -43,7 +43,7 @@ m4_define([gnome_desktop_minimum_version], [2.91.3]) m4_define([gnome_icon_theme_minimum_version], [2.30.2.1]) m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92]) m4_define([gconf_minimum_version], [2.0.0]) dnl XXX Just a Guess -m4_define([libsoup_minimum_version], [2.4.0]) dnl XXX Just a Guess +m4_define([libsoup_minimum_version], [2.31.2]) m4_define([libxml_minimum_version], [2.7.3]) m4_define([shared_mime_info_minimum_version], [0.22]) m4_define([libpst_minimum_version], [0.6.41]) -- cgit v1.2.3 From 5437ef08afdf985caad63d3d15bec5438b30ac11 Mon Sep 17 00:00:00 2001 From: Niki Guldbrand Date: Tue, 19 Apr 2011 11:23:08 +0200 Subject: Bug #645721 - Fix build error when enabling kerberos without specifying path --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 0bbe968ace..5e5fb17941 100644 --- a/configure.ac +++ b/configure.ac @@ -683,7 +683,7 @@ AC_SUBST(GTKHTML_LIBS) dnl ************ dnl Kerberos 5 dnl ************ -EVO_KRB5_SUPPORT +EVO_KRB5_SUPPORT(no) dnl ****************************** dnl Mono hooks -- cgit v1.2.3 From 8cc43a45671aa8e36aeaf0cbe54fcbb10f421aec Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 24 Apr 2011 10:12:05 -0400 Subject: Bump gladeui-2.0 minimum version to 3.10.0. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 5e5fb17941..f7f1270ecf 100644 --- a/configure.ac +++ b/configure.ac @@ -53,7 +53,7 @@ dnl Optional Packages m4_define([champlain_minimum_version], [0.8]) m4_define([clutter_gtk_minimum_version], [0.90]) m4_define([geoclue_minimum_version], [0.11.1]) -m4_define([gladeui_minimum_version], [3.0.0]) +m4_define([gladeui_minimum_version], [3.10.0]) m4_define([gweather_minimum_version], [2.90.0]) m4_define([libcanberra_gtk_minimum_version], [0.25]) m4_define([nm_minimum_version], [0.7]) -- cgit v1.2.3 From 218bd67a1e0ab29971d3bf7f1c111210b0d74e2d Mon Sep 17 00:00:00 2001 From: Vibha Yadav Date: Wed, 4 May 2011 17:34:48 +0530 Subject: Bug 649365 - Creation of new repository evolution-groupwise Removing groupwise plugin code from evolution. --- configure.ac | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f7f1270ecf..777d2166d2 100644 --- a/configure.ac +++ b/configure.ac @@ -250,7 +250,6 @@ PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], libecal-1.2 >= eds_minimum_version libedataserver-1.2 >= eds_minimum_version libedataserverui-3.0 >= eds_minimum_version - libegroupwise-1.2 >= eds_minimum_version libebackend-1.2 >= eds_minimum_version]) dnl ****************************** @@ -1175,7 +1174,7 @@ EVO_SET_COMPILE_FLAGS(CAMEL, camel-provider-1.2, $MANUAL_NSS_CFLAGS, $MOXILLA_NS AC_SUBST(CAMEL_CFLAGS) AC_SUBST(CAMEL_LIBS) -EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, camel-provider-1.2 libedataserver-1.2 libegroupwise-1.2) +EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, camel-provider-1.2 libedataserver-1.2) AC_SUBST(CAMEL_GROUPWISE_CFLAGS) AC_SUBST(CAMEL_GROUPWISE_LIBS) @@ -1402,7 +1401,7 @@ AC_ARG_ENABLE([plugins], [enable_plugins="$enableval"],[enable_plugins=all]) dnl Add any new plugins here -plugins_base_always="calendar-file calendar-http itip-formatter default-source addressbook-file mark-all-read groupwise-features publish-calendar caldav imap-features google-account-setup webdav-account-setup" +plugins_base_always="calendar-file calendar-http itip-formatter default-source addressbook-file mark-all-read publish-calendar caldav imap-features google-account-setup webdav-account-setup" plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN" dist_plugins_base="$plugins_base_always calendar-weather sa-junk-plugin bogo-junk-plugin" @@ -1752,7 +1751,6 @@ plugins/email-custom-header/Makefile plugins/external-editor/Makefile plugins/face/Makefile plugins/google-account-setup/Makefile -plugins/groupwise-features/Makefile plugins/image-inline/Makefile plugins/imap-features/Makefile plugins/itip-formatter/Makefile -- cgit v1.2.3 From d131786a3f6c9337e738df9f70e64e2f373d1c44 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 8 May 2011 12:26:10 -0400 Subject: NEWS update for 3.1.1 release. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 777d2166d2..b681df8f51 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [3]) m4_define([evo_minor_version], [1]) -m4_define([evo_micro_version], [0]) +m4_define([evo_micro_version], [1]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit v1.2.3 From 2bf3460cd3eb0853a1d10a6e36f5091898a5533f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 8 May 2011 13:37:09 -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 b681df8f51..f21ff24740 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [3]) m4_define([evo_minor_version], [1]) -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 v1.2.3 From d20e186ce7f59d1524fb8946b5dbf7983fbd7802 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 May 2011 13:21:22 +0200 Subject: Bug #601541 - Add 'Copy Image' Option On Inline Email Images --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f21ff24740..4d1e0915a5 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,7 @@ dnl Required Packages m4_define([glib_minimum_version], [2.28]) m4_define([gtk_minimum_version], [3.0.2]) m4_define([eds_minimum_version], [evo_version]) -m4_define([gtkhtml_minimum_version], [3.91.3]) +m4_define([gtkhtml_minimum_version], [4.1.2]) m4_define([gnome_desktop_minimum_version], [2.91.3]) m4_define([gnome_icon_theme_minimum_version], [2.30.2.1]) m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92]) -- cgit v1.2.3 From 6dc3c692264a04470d842400e909034c3633bdae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Thu, 2 Jun 2011 16:57:23 +0200 Subject: Bug #642557 - Display maps in contact preview --- configure.ac | 65 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 32 insertions(+), 33 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 4d1e0915a5..79132fb670 100644 --- a/configure.ac +++ b/configure.ac @@ -50,7 +50,7 @@ m4_define([libpst_minimum_version], [0.6.41]) m4_define([libnotify_minimum_version], [0.5.1]) dnl Optional Packages -m4_define([champlain_minimum_version], [0.8]) +m4_define([champlain_minimum_version], [0.10]) m4_define([clutter_gtk_minimum_version], [0.90]) m4_define([geoclue_minimum_version], [0.11.1]) m4_define([gladeui_minimum_version], [3.10.0]) @@ -1414,7 +1414,7 @@ dist_plugins_standard="$plugins_standard audio-inline image-inline pst-import" plugins_experimental_always="external-editor" plugins_experimental="$plugins_experimental_always $TNEF_ATTACHMENTS" -dist_plugins_experimental="$plugins_experimental_always tnef-attachments contacts-map" +dist_plugins_experimental="$plugins_experimental_always tnef-attachments" dnl ****************************************************************** dnl The following plugins have additional library dependencies. @@ -1462,42 +1462,42 @@ if test "x$enable_weather" = "xyes"; then fi fi -dnl ****************************************************** -dnl contacts-map plugin requires champlain-gtk and geoclue -dnl N.B. The plugin is experimental so only require these -dnl packages if we are building experimental plugins. -dnl ****************************************************** -if test "x$enable_plugins" = "xexperimental"; then - AC_ARG_ENABLE([contacts-map], - [AS_HELP_STRING([--enable-contacts-map], - [Enable contacts-map plugin @<:@default=yes@:>@])], - [enable_contacts_map="$enableval"], [enable_contacts_map=yes]) - - if test "x$enable_contacts_map" = "xyes"; then - PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.8 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no]) - AC_SUBST(CHAMPLAIN_CFLAGS) - AC_SUBST(CHAMPLAIN_LIBS) - - if test "x$have_champlain" = "xno"; then - AC_MSG_ERROR([champlain-gtk-0.8 >= champlain_minimum_version is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.]) - fi +dnl ******************************************************************** +dnl maps in contacts preview requires champlain-gtk, geoclue and clutter +dnl ******************************************************************** +AC_ARG_ENABLE([contact-maps], + [AS_HELP_STRING([--enable-contact-maps], + [Enable contact maps @<:@default=no@:>@])], + [enable_contact_maps="$enableval"], [enable_contact_maps="no"]) + +if test "x$enable_contact_maps" = "xyes"; then + if test "x$with_clutter" = "xno"; then + AC_MSG_ERROR([Clutter is required for maps in contacts. Use --with-clutter=yes to enable clutter.]) + fi - PKG_CHECK_MODULES([GEOCLUE], [geoclue >= geoclue_minimum_version], [have_geoclue=yes], [have_geoclue=no]) - AC_SUBST(GEOCLUE_CFLAGS) - AC_SUBST(GEOCLUE_LIBS) + PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.10 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no]) + AC_SUBST(CHAMPLAIN_CFLAGS) + AC_SUBST(CHAMPLAIN_LIBS) - if test "x$have_geoclue" = "xno"; then - AC_MSG_ERROR([geoclue is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.]) - fi + if test "x$have_champlain" = "xno"; then + AC_MSG_ERROR([champlain-gtk-0.10 >= champlain_minimum_version is required for maps in contacts preview.]) + fi - PKG_CHECK_MODULES([CLUTTER_GTK], [clutter-gtk-1.0 >= clutter_gtk_minimum_version], [have_clutter_gtk="yes"], [have_clutter_gtk="no"] ) + PKG_CHECK_MODULES([GEOCLUE], [geoclue >= geoclue_minimum_version], [have_geoclue=yes], [have_geoclue=no]) + AC_SUBST(GEOCLUE_CFLAGS) + AC_SUBST(GEOCLUE_LIBS) - if test "x$have_clutter_gtk" = "xno"; then - AC_MSG_ERROR([clutter-gtk-1.0 is required for the contacts-map plugin. Use --disable-contacts-map to exclude the plugin.]) - fi + if test "x$have_geoclue" = "xno"; then + AC_MSG_ERROR([geoclue is required for maps in contacts preview.]) + fi - plugins_standard="$plugins_standard contacts-map" + PKG_CHECK_MODULES([CLUTTER_GTK], [clutter-gtk-1.0 >= clutter_gtk_minimum_version], [have_clutter_gtk="yes"], [have_clutter_gtk="no"] ) + + if test "x$have_clutter_gtk" = "xno"; then + AC_MSG_ERROR([clutter-gtk-1.0 is required for maps in contacts preview.]) fi + + AC_DEFINE(WITH_CONTACT_MAPS, 1, [When defined contacts preview will contain maps]) fi dnl ***************************************** @@ -1767,7 +1767,6 @@ plugins/templates/Makefile plugins/tnef-attachments/Makefile plugins/vcard-inline/Makefile plugins/webdav-account-setup/Makefile -plugins/contacts-map/Makefile smclient/Makefile smime/Makefile smime/lib/Makefile -- cgit v1.2.3 From 08af0d1f81a4e983bb49d8fb8fe74e670adbb8f6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 13 Jun 2011 13:20:44 -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 79132fb670..3afa648953 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [3]) m4_define([evo_minor_version], [1]) -m4_define([evo_micro_version], [2]) +m4_define([evo_micro_version], [3]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit v1.2.3 From 38790d8478e906a5c59d0c4a5216f297f305bfeb Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 14 Jun 2011 08:54:20 +0200 Subject: Do not use deprecated EBook/ECal API --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 3afa648953..1078197d2a 100644 --- a/configure.ac +++ b/configure.ac @@ -73,6 +73,8 @@ AS_COMPILER_FLAGS(WARNING_FLAGS, -DEDS_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES + -DE_BOOK_DISABLE_DEPRECATED + -DE_CAL_DISABLE_DEPRECATED -Wall -Wextra -Wno-missing-field-initializers -Wno-sign-compare @@ -1687,7 +1689,6 @@ widgets/text/Makefile widgets/table/Makefile calendar/Makefile calendar/importers/Makefile -calendar/common/Makefile calendar/gui/Makefile calendar/gui/alarm-notify/Makefile calendar/gui/dialogs/Makefile -- cgit v1.2.3 From 810b301080ba5e47af062494e6d2b98f884953b2 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 14 Jun 2011 09:21:27 +0200 Subject: Bug #652394 - Port google-account-setup plugin to libgdata 0.9.0 --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 1078197d2a..903e50e7be 100644 --- a/configure.ac +++ b/configure.ac @@ -1283,10 +1283,14 @@ EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-gnome-2.4 >= libsoup_minimum_version) AC_SUBST(LIBSOUP_CFLAGS) AC_SUBST(LIBSOUP_LIBS) -EVO_SET_COMPILE_FLAGS(GDATA, libgdata >= 0.4.0) +EVO_SET_COMPILE_FLAGS(GDATA, libgdata >= 0.7.0) AC_SUBST(GDATA_CFLAGS) AC_SUBST(GDATA_LIBS) +if `$PKG_CONFIG --atleast-version=0.9 libgdata`; then + AC_DEFINE(HAVE_LIBGDATA_0_9,1,[libgdata is 0.9 or higher]) +fi + EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgtkhtml-4.0 libebook-1.2 libecal-1.2 libedataserverui-3.0 libebackend-1.2 $libnotify gtkhtml-editor-4.0) AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) AC_SUBST(EVOLUTION_CALENDAR_LIBS) -- cgit v1.2.3 From dd6e64ad305e1ab181c6276ed4c77d910a36a4fa Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 9 Jun 2011 16:28:36 -0400 Subject: Prototype an online-accounts module. Integrates with the GNOME Online Accounts service. Creates Evolution sources for a GOA Google account and keeps them synchronized. Also registers a new CamelSaslXOAuth class for use with GMail. Authentication of Google Calendars and Google Contacts using OAuth is still under development. --- configure.ac | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 903e50e7be..d3bcd502a1 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,7 @@ m4_define([champlain_minimum_version], [0.10]) m4_define([clutter_gtk_minimum_version], [0.90]) m4_define([geoclue_minimum_version], [0.11.1]) m4_define([gladeui_minimum_version], [3.10.0]) +m4_define([goa_minimum_version], [3.1.1]) m4_define([gweather_minimum_version], [2.90.0]) m4_define([libcanberra_gtk_minimum_version], [0.25]) m4_define([nm_minimum_version], [0.7]) @@ -1085,6 +1086,23 @@ else fi AC_SUBST(TNEF_CFLAGS) +dnl ******************************* +dnl Check for GNOME Online Accounts +dnl ******************************* +AC_ARG_ENABLE([goa], + [AS_HELP_STRING([--enable-goa], + [enable GNOME Online Accounts support (default=yes)])], + [enable_goa=$enableval], [enable_goa=yes]) +AC_MSG_CHECKING([if GNOME Online Accounts support is enabled]) +AC_MSG_RESULT([$enable_goa]) +if test "x$enable_goa" = xyes; then + PKG_CHECK_MODULES([GOA], [goa-1.0 >= goa_minimum_version],, + [AC_MSG_ERROR([goa-1.0 not found (or version < goa_minimum_version), + If you want to disable GNOME Online Accounts support, + please append --disable-goa to configure.])]) +fi +AM_CONDITIONAL([ENABLE_ONLINE_ACCOUNTS], [test "x$enable_goa" = xyes]) + dnl ****************************** dnl Check for NetworkManager dnl ****************************** @@ -1732,6 +1750,7 @@ modules/composer-autosave/Makefile modules/connman/Makefile modules/mailto-handler/Makefile modules/network-manager/Makefile +modules/online-accounts/Makefile modules/offline-alert/Makefile modules/plugin-lib/Makefile modules/plugin-manager/Makefile @@ -1801,8 +1820,9 @@ echo " LDAP support: $msg_ldap Clutter support: $with_clutter NetworkManager: $enable_nm - Windows SENS: $enable_sens + Windows SENS: $enable_sens ConnMan: $enable_connman + GNOME Online Accounts: $enable_goa Libnotify: $HAVE_LIBNOTIFY Kerberos 5: $msg_krb5 SSL support: $msg_ssl -- cgit v1.2.3 From b1ff4355c561b8c212aa1e0f323dfedb17c486cd Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Mon, 4 Jul 2011 14:58:52 +0530 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 d3bcd502a1..c51912fe76 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [3]) m4_define([evo_minor_version], [1]) -m4_define([evo_micro_version], [3]) +m4_define([evo_micro_version], [4]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit v1.2.3 From c1d697b5c18d152a0212bcc13dcfc158f2f9ecfb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 9 Jul 2011 17:33:00 -0400 Subject: Remove G_DISABLE_DEPRECATED. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c51912fe76..5d380f07e4 100644 --- a/configure.ac +++ b/configure.ac @@ -68,8 +68,7 @@ dnl ****************************** dnl Compiler Warning Flags dnl ****************************** AS_COMPILER_FLAGS(WARNING_FLAGS, - "-DG_DISABLE_DEPRECATED - -DPANGO_DISABLE_DEPRECATED + "-DPANGO_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DEDS_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -- cgit v1.2.3 From 1f002e02aaa2bcd0f8128937940b025cf13b0828 Mon Sep 17 00:00:00 2001 From: Antoine Jacoutot Date: Tue, 12 Jul 2011 23:28:14 +0200 Subject: Fix OpenBSD/FreeBSD support Move the "$host" down when $host is actually set (that is after AC_CANONICAL_HOST). Don't set DL_LIB to libdl which is not available on OpenBSD/FreeBSD and set NO_UNDEFINED to null. https://bugzilla.gnome.org/show_bug.cgi?id=654478 --- configure.ac | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 5d380f07e4..474d20b449 100644 --- a/configure.ac +++ b/configure.ac @@ -101,6 +101,10 @@ dnl -DE_CAL_DISABLE_DEPRECATED AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing" AC_SUBST(AM_CPPFLAGS) +AC_CANONICAL_HOST +AC_DEFINE_UNQUOTED(VERSION_COMMENT, "", [Define if you want a comment appended to the version number]) + +dnl This must stay after AC_CANONICAL_HOST, which defines $host. case "$host" in *openbsd*|*freebsd*) dnl Do not set '-Wl,--no-undefined' on freebsd/openbsd @@ -110,8 +114,6 @@ case "$host" in ;; esac -AC_CANONICAL_HOST -AC_DEFINE_UNQUOTED(VERSION_COMMENT, "", [Define if you want a comment appended to the version number]) dnl ************************************* dnl Put the ACLOCAL flags in the Makefile @@ -203,6 +205,15 @@ case "$host" in CHAMPLAIN_REQUIREMENT='' GEOCLUE_REQUIREMENT='' ;; +*openbsd*|*freebsd*) + os_win32=no + NO_UNDEFINED='' + SOEXT='.so' + SA_JUNK_PLUGIN=sa-junk-plugin + BF_JUNK_PLUGIN=bogo-junk-plugin + DL_LIB='' + SOFTOKN3_LIB='-lsoftokn3' + ;; *) os_win32=no NO_UNDEFINED='-no-undefined' -- cgit v1.2.3 From 8dfd4278a78e7d6ae30f92d50ee46029a5fbd106 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 12 Jul 2011 07:06:12 -0400 Subject: Convert junk filtering EPlugins to EExtensions. We now have a proper junk mail filtering API. All junk filtering extensions must subclass EMailJunkFilter for user preferences and availability testing, and implement the CamelJunkFilter interface for the actual junk filtering and learning operations. The bogofilter module should be feature-equivalent to its former EPlugin. The spamassassin module is far more complex. It's nearly feature-equivalent to its former EPlugin, but I ditched the spamd respawning code since it seemed unnecessary for a mail client to have to deal with. If there's a huge outcry from users about it I'll reluctantly put it back, but I don't expect one. This gets us a step closer to killing off EConfig, and eventually the EPlugin framework itself. --- configure.ac | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 474d20b449..8ba00a265e 100644 --- a/configure.ac +++ b/configure.ac @@ -198,8 +198,6 @@ case "$host" in os_win32=yes NO_UNDEFINED='-no-undefined' SOEXT='.dll' - SA_JUNK_PLUGIN='' - BF_JUNK_PLUGIN='' DL_LIB='' SOFTOKN3_LIB='' CHAMPLAIN_REQUIREMENT='' @@ -218,8 +216,6 @@ case "$host" in os_win32=no NO_UNDEFINED='-no-undefined' SOEXT='.so' - SA_JUNK_PLUGIN=sa-junk-plugin - BF_JUNK_PLUGIN=bogo-junk-plugin DL_LIB='-ldl' SOFTOKN3_LIB='-lsoftokn3' ;; @@ -1437,8 +1433,8 @@ AC_ARG_ENABLE([plugins], dnl Add any new plugins here plugins_base_always="calendar-file calendar-http itip-formatter default-source addressbook-file mark-all-read publish-calendar caldav imap-features google-account-setup webdav-account-setup" -plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN" -dist_plugins_base="$plugins_base_always calendar-weather sa-junk-plugin bogo-junk-plugin" +plugins_base="$plugins_base_always" +dist_plugins_base="$plugins_base_always calendar-weather" plugins_standard_always="bbdb save-calendar mail-to-task mailing-list-actions prefer-plain mail-notification attachment-reminder backup-restore email-custom-header face templates vcard-inline dbx-import" @@ -1754,6 +1750,7 @@ mail/importers/Makefile maint/Makefile modules/Makefile modules/addressbook/Makefile +modules/bogofilter/Makefile modules/calendar/Makefile modules/mail/Makefile modules/composer-autosave/Makefile @@ -1766,6 +1763,7 @@ modules/plugin-lib/Makefile modules/plugin-manager/Makefile modules/plugin-mono/Makefile modules/plugin-python/Makefile +modules/spamassassin/Makefile modules/startup-wizard/Makefile modules/windows-sens/Makefile plugins/Makefile @@ -1774,7 +1772,6 @@ plugins/attachment-reminder/Makefile plugins/audio-inline/Makefile plugins/backup-restore/Makefile plugins/bbdb/Makefile -plugins/bogo-junk-plugin/Makefile plugins/caldav/Makefile plugins/calendar-file/Makefile plugins/calendar-http/Makefile @@ -1795,7 +1792,6 @@ plugins/mark-all-read/Makefile plugins/prefer-plain/Makefile plugins/pst-import/Makefile plugins/publish-calendar/Makefile -plugins/sa-junk-plugin/Makefile plugins/save-calendar/Makefile plugins/templates/Makefile plugins/tnef-attachments/Makefile -- cgit v1.2.3 From 15673ff05eec3c049940ad95a6972016173c889b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 23 Jul 2011 12:31:50 -0500 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 8ba00a265e..a1539e138d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [3]) m4_define([evo_minor_version], [1]) -m4_define([evo_micro_version], [4]) +m4_define([evo_micro_version], [5]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit v1.2.3 From 99b4a9a4b111278a113334d9074cbd109a51da7f Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Sun, 14 Aug 2011 22:51:38 +0530 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 a1539e138d..5c2c5edf2a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [3]) m4_define([evo_minor_version], [1]) -m4_define([evo_micro_version], [5]) +m4_define([evo_micro_version], [90]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit v1.2.3 From bd8149639ec087452313fd7cf935dd16b228dffb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 28 Aug 2011 13:07:38 -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 5c2c5edf2a..4c1885e764 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [3]) m4_define([evo_minor_version], [1]) -m4_define([evo_micro_version], [90]) +m4_define([evo_micro_version], [91]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit v1.2.3 From 22cd82de31a4d74bc83403686dd46a35cc92bfef Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Aug 2011 09:30:31 -0400 Subject: Disable inline-image plugin by default. Still waiting for a gtkimageview release that works with GTK+ 3. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 4c1885e764..4ff7f299b1 100644 --- a/configure.ac +++ b/configure.ac @@ -1536,7 +1536,7 @@ dnl ***************************************** AC_ARG_ENABLE([image-inline], [AS_HELP_STRING([--enable-image-inline], [Enable image-inline plugin @<:@default=yes@:>@])], - [enable_image_inline="$enableval"], [enable_image_inline=yes]) + [enable_image_inline="$enableval"], [enable_image_inline=no]) if test "x$enable_image_inline" = "xyes"; then PKG_CHECK_MODULES(GTKIMAGEVIEW, gtkimageview >= gtkimageview_minimum_version, have_imageview=yes, have_imageview=no) -- cgit v1.2.3 From 872a0d94b5a9629432bb909d144f81ab7398c79c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Aug 2011 09:55:19 -0400 Subject: Fix default in image-inline help string. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 4ff7f299b1..43f7c992cd 100644 --- a/configure.ac +++ b/configure.ac @@ -1535,7 +1535,7 @@ dnl image-inline plugin requires gtkimageview dnl ***************************************** AC_ARG_ENABLE([image-inline], [AS_HELP_STRING([--enable-image-inline], - [Enable image-inline plugin @<:@default=yes@:>@])], + [Enable image-inline plugin @<:@default=no@:>@])], [enable_image_inline="$enableval"], [enable_image_inline=no]) if test "x$enable_image_inline" = "xyes"; then -- cgit v1.2.3 From bb5984a6ef26f4f580b66f9ae1732c2e8721f355 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 31 Aug 2011 17:47:45 +0200 Subject: Create tar.xz files for 'make dist' only --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 43f7c992cd..69e7b762c6 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ m4_define([upgrade_revision], [0]) dnl Autoconf / Automake Initialization AC_PREREQ(2.58) AC_INIT([evolution],[evo_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution]) -AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign]) +AM_INIT_AUTOMAKE([1.10 dist-xz no-dist-gzip -Wall -Werror foreign]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_SRCDIR(README) -- cgit v1.2.3 From 9548951f3edde3a8855f911f906bb1831cc3809f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 2 Sep 2011 16:30:24 -0400 Subject: Add "Contact Maps" to the configure summary. --- configure.ac | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 69e7b762c6..b033d76e65 100644 --- a/configure.ac +++ b/configure.ac @@ -1828,6 +1828,7 @@ echo " NetworkManager: $enable_nm Windows SENS: $enable_sens ConnMan: $enable_connman + Contact Maps: $enable_contact_maps GNOME Online Accounts: $enable_goa Libnotify: $HAVE_LIBNOTIFY Kerberos 5: $msg_krb5 -- cgit v1.2.3 From 184ae3971dd80b8ba59b826d845ba3643126758f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 3 Sep 2011 22:27:31 -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 b033d76e65..c4ff6cfd4b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [3]) m4_define([evo_minor_version], [1]) -m4_define([evo_micro_version], [91]) +m4_define([evo_micro_version], [92]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit v1.2.3 From 00823c131f1c9dad2fcc2e1f7cd98b3cfeaa8501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 9 Sep 2011 15:27:59 +0100 Subject: Make maintiner mode enabled by default See http://blogs.gnome.org/desrt/2011/09/08/am_maintainer_mode-is-not-cool/ --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c4ff6cfd4b..a96e80b554 100644 --- a/configure.ac +++ b/configure.ac @@ -123,7 +123,7 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" dnl ****************************** dnl Initialize maintainer mode dnl ****************************** -AM_MAINTAINER_MODE +AM_MAINTAINER_MODE([enable]) if test "$evo_version" != "$evo_stable_version"; then AC_DEFINE(STABLE_VERSION, ["evo_stable_version"], -- cgit v1.2.3 From 48d151e8a55875f675bae6cfcbab8ded190d47c7 Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Mon, 19 Sep 2011 17:58:32 +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 a96e80b554..593b14f1e2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [3]) -m4_define([evo_minor_version], [1]) -m4_define([evo_micro_version], [92]) +m4_define([evo_minor_version], [2]) +m4_define([evo_micro_version], [0]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], -- cgit v1.2.3 From 2e3800ef8fc2daef92ea7cf1342218bb55dae9f9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 24 Sep 2011 18:19:58 -0400 Subject: Post-release version bump. --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 593b14f1e2..ac19503fc5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [3]) -m4_define([evo_minor_version], [2]) -m4_define([evo_micro_version], [0]) +m4_define([evo_minor_version], [3]) +m4_define([evo_micro_version], [1]) m4_define([evo_version], [evo_major_version.evo_minor_version.evo_micro_version]) m4_define([evo_stable_version], @@ -13,8 +13,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.4 +m4_define([base_version], [3.4]) dnl Upgrade Revision: This is for triggering migration calls between dnl varying versions. Reset to 0 whenever BASE_VERSION changes. -- cgit v1.2.3 From 53bc6ffc531d7a7188e15be245a31f301090ee15 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 10 Sep 2011 11:47:15 -0400 Subject: The EExtension framework is now in libebackend. The EModule, EExtensible and EExtension classes as well as the e_type_traverse() function have been moved to Evolution-Data-Server's libebackend library to replace e-data-server-module.c. Now Evolution-Data-Server modules use the same framework as Evolution. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ac19503fc5..0368b16f07 100644 --- a/configure.ac +++ b/configure.ac @@ -1232,7 +1232,7 @@ AC_SUBST(CERT_UI_LIBS) dnl ************ dnl E_UTIL Flags dnl ************ -EVO_SET_COMPILE_FLAGS(E_UTIL, libedataserverui-3.0 camel-provider-1.2 $mozilla_nspr, $MANUAL_NSPR_CFLAGS $MANUAL_NSPR_LIBS) +EVO_SET_COMPILE_FLAGS(E_UTIL, libebackend-1.2 libedataserverui-3.0 camel-provider-1.2 $mozilla_nspr, $MANUAL_NSPR_CFLAGS $MANUAL_NSPR_LIBS) AC_SUBST(E_UTIL_CFLAGS) AC_SUBST(E_UTIL_LIBS) -- cgit v1.2.3 From 0ed3d1c025dce1bb6c3a4a421f7c41c454263cd6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 27 Sep 2011 12:59:01 -0400 Subject: Adapt to camel-provider-1.2.pc going away. --- configure.ac | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 0368b16f07..7c4c13feae 100644 --- a/configure.ac +++ b/configure.ac @@ -1196,14 +1196,10 @@ AM_CONDITIONAL([ENABLE_CONNMAN], [test "$enable_connman" = yes]) dnl ****************************** dnl Camel Flags dnl ****************************** -EVO_SET_COMPILE_FLAGS(CAMEL, camel-provider-1.2, $MANUAL_NSS_CFLAGS, $MOXILLA_NSS_CFLAGS) +EVO_SET_COMPILE_FLAGS(CAMEL, camel-1.2, $MANUAL_NSS_CFLAGS, $MOXILLA_NSS_CFLAGS) AC_SUBST(CAMEL_CFLAGS) AC_SUBST(CAMEL_LIBS) -EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, camel-provider-1.2 libedataserver-1.2) -AC_SUBST(CAMEL_GROUPWISE_CFLAGS) -AC_SUBST(CAMEL_GROUPWISE_LIBS) - if test "x$mozilla_nss" != "x"; then EVO_SET_COMPILE_FLAGS(MOZILLA_NSS, $mozilla_nss) MOZILLA_L_DIR=`${PKG_CONFIG} --libs-only-L $mozilla_nss` @@ -1232,7 +1228,7 @@ AC_SUBST(CERT_UI_LIBS) dnl ************ dnl E_UTIL Flags dnl ************ -EVO_SET_COMPILE_FLAGS(E_UTIL, libebackend-1.2 libedataserverui-3.0 camel-provider-1.2 $mozilla_nspr, $MANUAL_NSPR_CFLAGS $MANUAL_NSPR_LIBS) +EVO_SET_COMPILE_FLAGS(E_UTIL, libebackend-1.2 libedataserverui-3.0 camel-1.2 $mozilla_nspr, $MANUAL_NSPR_CFLAGS $MANUAL_NSPR_LIBS) AC_SUBST(E_UTIL_CFLAGS) AC_SUBST(E_UTIL_LIBS) @@ -1255,7 +1251,7 @@ AC_SUBST(E_WIDGETS_LIBS) dnl *************** dnl IMPORTERS Flags dnl *************** -EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-3.0 camel-provider-1.2 libebook-1.2) +EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-3.0 camel-1.2 libebook-1.2) AC_SUBST(IMPORTERS_CFLAGS) AC_SUBST(IMPORTERS_LIBS) @@ -1336,7 +1332,7 @@ AC_MSG_RESULT([$ac_cv_have_iuth]) dnl ********** dnl Mail Flags dnl ********** -EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-1.2 libgtkhtml-4.0 gtkhtml-editor-4.0 $mozilla_nss libebook-1.2 libedataserverui-3.0) +EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-1.2 libgtkhtml-4.0 gtkhtml-editor-4.0 $mozilla_nss libebook-1.2 libedataserverui-3.0) AC_SUBST(EVOLUTION_MAIL_CFLAGS) AC_SUBST(EVOLUTION_MAIL_LIBS) -- cgit v1.2.3 From 3d98af62e582b48fe9c23c8f6e2397911cbce27c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 29 Sep 2011 12:05:23 -0400 Subject: Require GLib 2.30. Drop all GLIB_CHECK_VERSION macros. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7c4c13feae..5d079c1726 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,7 @@ dnl Automake 1.11 - Silent Build Rules m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Required Packages -m4_define([glib_minimum_version], [2.28]) +m4_define([glib_minimum_version], [2.30]) m4_define([gtk_minimum_version], [3.0.2]) m4_define([eds_minimum_version], [evo_version]) m4_define([gtkhtml_minimum_version], [4.1.2]) -- cgit v1.2.3 From 1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 4 Oct 2011 21:32:41 -0400 Subject: Simplify library dependency flags. We have a confusing array of nearly-identical CFLAGS/LIBS definitions in configure.ac. Time to simplify. Instead let's just have one definition that includes all the libraries provided by Evolution-Data-Server (incl. Camel). That, in combination with GNOME_PLATFORM, gives us most of what we need for compliation and linking, and we can sprinkle definitions for additional library dependencies in Makefile.am's as needed. --- configure.ac | 98 ++++++++---------------------------------------------------- 1 file changed, 13 insertions(+), 85 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 5d079c1726..ea039fbeee 100644 --- a/configure.ac +++ b/configure.ac @@ -255,11 +255,14 @@ AC_SUBST(GNOME_PLATFORM_CFLAGS) AC_SUBST(GNOME_PLATFORM_LIBS) PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], - [libebook-1.2 >= eds_minimum_version + [camel-1.2 >= eds_minimum_version + libebook-1.2 >= eds_minimum_version libecal-1.2 >= eds_minimum_version libedataserver-1.2 >= eds_minimum_version libedataserverui-3.0 >= eds_minimum_version libebackend-1.2 >= eds_minimum_version]) +AC_SUBST(EVOLUTION_DATA_SERVER_CFLAGS) +AC_SUBST(EVOLUTION_DATA_SERVER_LIBS) dnl ****************************** dnl Canberra / Canberra-GTK Sound @@ -684,7 +687,9 @@ dnl ************************* dnl GTKHTML check dnl XXX Drop the version from the package name? dnl ************************* -PKG_CHECK_MODULES([GTKHTML], [libgtkhtml-4.0 >= gtkhtml_minimum_version]) +PKG_CHECK_MODULES([GTKHTML], + [libgtkhtml-4.0 >= gtkhtml_minimum_version + gtkhtml-editor-4.0]) AC_SUBST(GTKHTML_CFLAGS) AC_SUBST(GTKHTML_LIBS) @@ -1193,13 +1198,6 @@ if test "x$enable_nm$enable_connman" = "xyesyes"; then fi AM_CONDITIONAL([ENABLE_CONNMAN], [test "$enable_connman" = yes]) -dnl ****************************** -dnl Camel Flags -dnl ****************************** -EVO_SET_COMPILE_FLAGS(CAMEL, camel-1.2, $MANUAL_NSS_CFLAGS, $MOXILLA_NSS_CFLAGS) -AC_SUBST(CAMEL_CFLAGS) -AC_SUBST(CAMEL_LIBS) - if test "x$mozilla_nss" != "x"; then EVO_SET_COMPILE_FLAGS(MOZILLA_NSS, $mozilla_nss) MOZILLA_L_DIR=`${PKG_CONFIG} --libs-only-L $mozilla_nss` @@ -1219,64 +1217,11 @@ dnl (which are dragged in through libedataserverui), as both dnl gnutls and mozilla-nss have a header called "pkcs12.h" which is dnl included in smime/lib/e-pkcs12.c. It wants the Mozilla NSS one. dnl -EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-3.0) -CERT_UI_CFLAGS="$MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS $CERT_UI_CFLAGS" -CERT_UI_LIBS="$MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS $CERT_UI_LIBS" +CERT_UI_CFLAGS="$MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS" +CERT_UI_LIBS="$MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS" AC_SUBST(CERT_UI_CFLAGS) AC_SUBST(CERT_UI_LIBS) -dnl ************ -dnl E_UTIL Flags -dnl ************ -EVO_SET_COMPILE_FLAGS(E_UTIL, libebackend-1.2 libedataserverui-3.0 camel-1.2 $mozilla_nspr, $MANUAL_NSPR_CFLAGS $MANUAL_NSPR_LIBS) -AC_SUBST(E_UTIL_CFLAGS) -AC_SUBST(E_UTIL_LIBS) - -E_UTIL_LIBS="$E_UTIL_LIBS $MATH_LIB" - -dnl ************** -dnl TZDIALOG Flags -dnl ************** -EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-1.2 camel-1.2) -AC_SUBST(TZDIALOG_CFLAGS) -AC_SUBST(TZDIALOG_LIBS) - -dnl *************** -dnl E_WIDGETS Flags -dnl *************** -EVO_SET_COMPILE_FLAGS(E_WIDGETS, libedataserverui-3.0 gtkhtml-editor-4.0) -AC_SUBST(E_WIDGETS_CFLAGS) -AC_SUBST(E_WIDGETS_LIBS) - -dnl *************** -dnl IMPORTERS Flags -dnl *************** -EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-3.0 camel-1.2 libebook-1.2) -AC_SUBST(IMPORTERS_CFLAGS) -AC_SUBST(IMPORTERS_LIBS) - -dnl *************** -dnl LIBFILTER Flags -dnl *************** -EVO_SET_COMPILE_FLAGS(LIBFILTER, libedataserver-1.2 camel-1.2) -AC_SUBST(LIBFILTER_CFLAGS) -AC_SUBST(LIBFILTER_LIBS) - -dnl *********** -dnl Shell Flags -dnl *********** -EVO_SET_COMPILE_FLAGS(SHELL, libgtkhtml-4.0 libedataserverui-3.0) -AC_SUBST(SHELL_CFLAGS) -AC_SUBST(SHELL_LIBS) - -dnl ***************** -dnl Addressbook Flags -dnl ***************** -EVOLUTION_ADDRESSBOOK_DEPS="libgtkhtml-4.0 libebook-1.2 libedataserverui-3.0 camel-1.2 gtkhtml-editor-4.0" -EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS) -AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) -AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS) - dnl *************** dnl Libnotify Flags dnl *************** @@ -1299,11 +1244,11 @@ fi dnl ************** dnl Calendar Flags dnl ************** -EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-gnome-2.4 >= libsoup_minimum_version) +PKG_CHECK_MODULES([LIBSOUP], [libsoup-gnome-2.4 >= libsoup_minimum_version]) AC_SUBST(LIBSOUP_CFLAGS) AC_SUBST(LIBSOUP_LIBS) -EVO_SET_COMPILE_FLAGS(GDATA, libgdata >= 0.7.0) +PKG_CHECK_MODULES([GDATA], [libgdata >= 0.7.0]) AC_SUBST(GDATA_CFLAGS) AC_SUBST(GDATA_LIBS) @@ -1311,16 +1256,12 @@ if `$PKG_CONFIG --atleast-version=0.9 libgdata`; then AC_DEFINE(HAVE_LIBGDATA_0_9,1,[libgdata is 0.9 or higher]) fi -EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgtkhtml-4.0 libebook-1.2 libecal-1.2 libedataserverui-3.0 libebackend-1.2 $libnotify gtkhtml-editor-4.0) -AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) -AC_SUBST(EVOLUTION_CALENDAR_LIBS) - dnl **************************** dnl Check for ical_set_unknown_token_handling_setting function dnl **************************** AC_MSG_CHECKING([ical_set_unknown_token_handling_setting function]) -save_cflags=$CFLAGS; CFLAGS=$EVOLUTION_CALENDAR_CFLAGS -save_libs=$LIBS; LIBS="$EVOLUTION_CALENDAR_LIBS" +save_cflags=$CFLAGS; CFLAGS="$EVOLUTION_DATA_SERVER_CFLAGS" +save_libs=$LIBS; LIBS="$EVOLUTION_DATA_SERVER_LIBS" AC_LINK_IFELSE([AC_LANG_PROGRAM( [[#include ]], [[ical_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN)]])], @@ -1329,19 +1270,6 @@ CFLAGS=$save_cflags LIBS=$save_libs AC_MSG_RESULT([$ac_cv_have_iuth]) -dnl ********** -dnl Mail Flags -dnl ********** -EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-1.2 libgtkhtml-4.0 gtkhtml-editor-4.0 $mozilla_nss libebook-1.2 libedataserverui-3.0) -AC_SUBST(EVOLUTION_MAIL_CFLAGS) -AC_SUBST(EVOLUTION_MAIL_LIBS) - -dnl *************************** -dnl Evolution-Data-Server Flags -dnl *************************** -DATASERVER_EXEC_VERSION=`${PKG_CONFIG} --variable=execversion evolution-data-server-1.2` -AC_SUBST(DATASERVER_EXEC_VERSION) - dnl ***************** dnl EggSMClient Flags dnl ***************** -- cgit v1.2.3