[tracker/tracker-0.8] Fix evolution plugin build failure with e-d-s 2.28
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/tracker-0.8] Fix evolution plugin build failure with e-d-s 2.28
- Date: Tue, 6 Apr 2010 12:10:11 +0000 (UTC)
commit 2e731949338d9d261e9c5eeb6087441d8ff9a29e
Author: Michael Biebl <biebl debian org>
Date: Tue Apr 6 11:48:34 2010 +0200
Fix evolution plugin build failure with e-d-s 2.28
Let pkg-config do the version check so we don't fail with e-d-s 2.28.
See also https://bugzilla.gnome.org/show_bug.cgi?id=613199
configure.ac | 3 +++
src/plugins/evolution/tracker-evolution-plugin.c | 5 ++---
2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 423e4d2..40cd3d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1468,6 +1468,9 @@ if test "x$enable_evolution_miner" != "xno" ; then
have_evolution_plugin=yes,
have_evolution_plugin=no)
+ PKG_CHECK_EXISTS([evolution-data-server-1.2 >= 2.29.1],
+ [AC_DEFINE(HAVE_EDS_2_29_1, 1, [Define if we have eds 2.29.1 or newer])])
+
AC_SUBST(EVOLUTION_PLUGIN_CFLAGS)
AC_SUBST(EVOLUTION_PLUGIN_LIBS)
diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
index 00f72a1..f924033 100644
--- a/src/plugins/evolution/tracker-evolution-plugin.c
+++ b/src/plugins/evolution/tracker-evolution-plugin.c
@@ -70,9 +70,8 @@
#include <libedataserver/e-account.h>
#include <libedataserver/e-account-list.h>
-#include <libedataserver/eds-version.h>
-#if EDS_CHECK_VERSION (2, 29, 1)
+#if HAVE_EDS_2_29_1
#include <e-util/e-account-utils.h>
#endif
@@ -2289,7 +2288,7 @@ tracker_evolution_plugin_init (TrackerEvolutionPlugin *plugin)
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_INVALID);
-#if EDS_CHECK_VERSION (2, 29, 1)
+#if HAVE_EDS_2_29_1
priv->accounts = g_object_ref (e_get_account_list ());
#else
priv->accounts = g_object_ref (mail_config_get_accounts ());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]