[tracker] Fixes: GB#627893, tracker 0.9.17 does not compile with e-d-s/evolution 2.31.90 built with gtk+ 3.

[Martyn James Russell <mr src gnome org>]

commit d08fc82182ca28932ae84460c90885467e34f646
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Aug 26 16:12:56 2010 +0100

    Fixes: GB#627893, tracker 0.9.17 does not compile with e-d-s/evolution 2.31.90 built with gtk+ 3.
    
    Based on a patch from Maciej Piechotka

 configure.ac                                     |   15 ++++++++++++++-
 src/plugins/evolution/tracker-evolution-plugin.c |    2 ++
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ddabbd1..b1e02d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -936,6 +936,15 @@ if test "x$enable_miner_evolution" != "xno"; then
                       evolution-data-server-1.2 >= $EDS_REQUIRED],
                      have_miner_evolution=yes,
                      have_miner_evolution=no)
+   if test "x$have_miner_evolution" = "xyes"; then
+       evolution_plugin=evolution-plugin
+   else
+       PKG_CHECK_MODULES(EVOLUTION_PLUGIN,
+                         [evolution-plugin-3.0 >= $EVO_REQUIRED
+                          evolution-data-server-1.2 >= $EDS_REQUIRED],
+                         have_miner_evolution=yes)
+       evolution_plugin=evolution-plugin-3.0
+   fi
 
    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])])
@@ -951,10 +960,14 @@ if test "x$enable_miner_evolution" != "xno"; then
                   AS_HELP_STRING([--with-evolution-plugins-dir],
                                  [path to Evolution plugins directory]))
       if test "x$with_evolution_plugins_dir" = "x" ; then
-         evolution_plugins_dir=`$PKG_CONFIG evolution-plugin --variable=plugindir`
+         evolution_plugins_dir=`$PKG_CONFIG $evolution_plugin --variable=plugindir`
       else
          evolution_plugins_dir="$with_evolution_plugins_dir"
       fi
+
+      if test -z $evolution_plugins_dir; then
+         AC_MSG_ERROR([Couldn't find evolution plugins dir, consider using --with-evolution-plugins-dir.])
+      fi
    fi
 else
    have_miner_evolution="no  (disabled)"
diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
index e3f585f..bf63285 100644
--- a/src/plugins/evolution/tracker-evolution-plugin.c
+++ b/src/plugins/evolution/tracker-evolution-plugin.c
@@ -41,7 +41,9 @@
 #include <sqlite3.h>
 
 #include <camel/camel.h>
+#ifndef HAVE_EDS_2_31_2
 #include <camel/camel-db.h>
+#endif
 
 #include <mail/mail-config.h>
 #include <mail/mail-session.h>