[tracker/evo-0.10] build: Support build with evolution 2.91.6 and later

[Jürg Billeter <juergbi src gnome org>]

commit 58118ae1b7450b81cadbf466a3752f7b0ef43df6
Author: Jürg Billeter <j bitron ch>
Date:   Wed Mar 30 16:44:51 2011 +0200

    build: Support build with evolution 2.91.6 and later
    
    Fixes GB#645934.

 configure.ac |   27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c58bb95..395321b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -357,11 +357,9 @@ PKG_CHECK_MODULES(TRACKER_MINER_FS, [$TRACKER_MINER_FS_REQUIRED])
 TRACKER_MINER_FS_LIBS="$TRACKER_MINER_FS_LIBS -lz -lm"
 
 # Check requirements for tracker-miner-evolution
-evolution_plugin_name="evolution-plugin"
-
 TRACKER_MINER_EVOLUTION_REQUIRED="glib-2.0                  >= $GLIB_REQUIRED
-                                  evolution-shell           >= $EVO_SHELL_REQUIRED
-                                  evolution-plugin          >= $EVO_REQUIRED
+                                  evolution-shell-3.0
+                                  evolution-plugin-3.0
                                   evolution-data-server-1.2 >= $EDS_REQUIRED
                                   camel-1.2                 >= $CAMEL_REQUIRED"
 
@@ -369,12 +367,19 @@ PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_REQUIRED],
                   [have_tracker_miner_evolution=yes],
                   [have_tracker_miner_evolution=no])
 
-if test "x$have_tracker_miner_evolution" != "xyes"; then
+if test "x$have_tracker_miner_evolution" = "xyes"; then
    evolution_plugin_name="evolution-plugin-3.0"
 
+   AC_DEFINE(EVOLUTION_SHELL_2_91, 1, [Use new evolution-shell API])
+else
+   evolution_plugin_name="evolution-plugin"
+
+
    TRACKER_MINER_EVOLUTION_REQUIRED="glib-2.0                  >= $GLIB_REQUIRED
-                                     evolution-plugin-3.0      >= $EVO_REQUIRED
-                                     evolution-data-server-1.2 >= $EDS_REQUIRED"
+                                     evolution-shell           >= $EVO_SHELL_REQUIRED
+                                     evolution-plugin          >= $EVO_REQUIRED
+                                     evolution-data-server-1.2 >= $EDS_REQUIRED
+                                     camel-1.2                 >= $CAMEL_REQUIRED"
 
    PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_REQUIRED],
                      [have_tracker_miner_evolution=yes],
@@ -1132,10 +1137,6 @@ fi
 
 if test "x$have_tracker_miner_evolution" = "xyes"; then
 
-   PKG_CHECK_MODULES(MINER_EVOLUTION_SHELL, evolution-shell > 2.91,
-                     [miner_evolution_2_91=yes],
-                     [miner_evolution_2_91=no])
-
    AC_ARG_WITH([evolution_plugin_dir],
                AS_HELP_STRING([--with-evolution-plugin-dir],
                               [path to Evolution plugin directory]))
@@ -1148,10 +1149,6 @@ if test "x$have_tracker_miner_evolution" = "xyes"; then
    if test -z $tracker_miner_evolution_install_dir; then
       AC_MSG_ERROR([Couldn't find evolution plugin dir, consider using --with-evolution-plugin-dir.])
    fi
-
-   if test "x$miner_evolution_2_91" = "xyes"; then
-      AC_DEFINE(EVOLUTION_SHELL_2_91, 1, [Use new evolution-shell API])
-   fi
 fi
 
 TRACKER_MINER_EVOLUTION_INSTALL_DIR=$tracker_miner_evolution_install_dir