[evolution-rss] Bug 725573 - Adapt to evolution 3.11.91 changes

[Lucian Langa <lucilanga src gnome org>]

commit 55f2fc268fd4d0ee286bf8340e81c2dd265abd5b
Author: Milan Crha <mcrha redhat com>
Date:   Thu Mar 6 19:31:36 2014 +0100

    Bug 725573 - Adapt to evolution 3.11.91 changes

 configure.ac    |   10 ++++++++--
 m4/evolution.m4 |   23 +++++++++++++++++------
 2 files changed, 25 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1439a85..6679ab5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_INIT([evolution-rss],[0.3.95],[http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-rss])
 AC_CONFIG_SRCDIR(src)
 
-AM_INIT_AUTOMAKE([1.10 dist-xz no-dist-gzip -Wall foreign])
+AM_INIT_AUTOMAKE([1.10 dist-xz no-dist-gzip -Wall -Wno-portability foreign])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -92,11 +92,17 @@ if test "$EVOLUTION_BASE_VERSION_S" = "-3.0"; then
        EVOLUTION_ADDITIONAL="libemail-engine"
 fi
 
+EVOLUTION_PLUGIN_CHECK="evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED"
+
+if test "$evolution_version_int" -ge "31191"; then
+       EVOLUTION_PLUGIN_CHECK=
+fi
+
 PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN,
 [  glib-2.0 >= $LIBGLIB_REQUIRED dnl
    gtk+-$LIBGTK_VERSION.0 >= $LIBGTK_REQUIRED dnl
    libsoup$SOUP >= $LIBSOUP_REQUIRED dnl
-   evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
+   $EVOLUTION_PLUGIN_CHECK dnl
    evolution-shell$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
    $EVOLUTION_ADDITIONAL dnl
    libebook-1.2 dnl
diff --git a/m4/evolution.m4 b/m4/evolution.m4
index 2aba701..da07a5a 100644
--- a/m4/evolution.m4
+++ b/m4/evolution.m4
@@ -78,10 +78,17 @@ AC_SUBST(MINOR_VERSION)
 dnl Evolution plugin install directory
 AC_ARG_WITH(plugin-install-dir, [  --with-plugin-install-dir=PATH path to evolution plugin directory])
 if test "x$with_plugin_install_dir" = "x"; then
-        PLUGIN_INSTALL_DIR=`$PKG_CONFIG --variable=plugindir evolution-plugin$EVOLUTION_BASE_VERSION_S`
-        if test "x$PLUGIN_INSTALL_DIR" = "x"; then
-                AC_MSG_ERROR(Unable to find plugin directory)
-                break;
+       if test "$evolution_version_int" -ge "031191"; then
+               PLUGIN_INSTALL_DIR=`$PKG_CONFIG --variable=plugindir evolution-shell$EVOLUTION_BASE_VERSION_S`
+               if test "x$PLUGIN_INSTALL_DIR" = "x"; then
+                       PLUGIN_INSTALL_DIR=`$PKG_CONFIG --variable=privlibdir 
evolution-shell$EVOLUTION_BASE_VERSION_S`/plugins
+               fi
+       else
+               PLUGIN_INSTALL_DIR=`$PKG_CONFIG --variable=plugindir 
evolution-plugin$EVOLUTION_BASE_VERSION_S`
+               if test "x$PLUGIN_INSTALL_DIR" = "x"; then
+                       AC_MSG_ERROR(Unable to find plugin directory)
+                       break;
+               fi
         fi
 fi
 AC_SUBST(PLUGIN_INSTALL_DIR)
@@ -97,7 +104,11 @@ fi
 AC_SUBST(ICON_DIR)
 
 dnl Evolution e-error install directory
-ERROR_DIR=`$PKG_CONFIG --variable=errordir evolution-plugin$EVOLUTION_BASE_VERSION_S`
+if test "$evolution_version_int" -ge "031191"; then
+       ERROR_DIR=`$PKG_CONFIG --variable=errordir evolution-shell$EVOLUTION_BASE_VERSION_S`
+else
+       ERROR_DIR=`$PKG_CONFIG --variable=errordir evolution-plugin$EVOLUTION_BASE_VERSION_S`
+fi
 if test "x$ERROR_DIR" = "x"; then
    AC_MSG_ERROR(Unable to find error file directory)
 fi
@@ -107,7 +118,7 @@ dnl test required for bonobo server installation
 dnl dnl user might specify wrong prefix or not specify at all
 AC_ARG_WITH(bonobo-servers-dir, [  --with-bonobo-servers-dir=PATH path to bonobo servers directory])
 if test "x$with_bonobo_servers_dir" = "x" ; then
-    BONOBO_LIBDIR=`$PKG_CONFIG --variable=libdir evolution-plugin$EVOLUTION_BASE_VERSION_S`
+    BONOBO_LIBDIR=`$PKG_CONFIG --variable=libdir evolution-shell$EVOLUTION_BASE_VERSION_S`
     if test "x$BONOBO_LIBDIR" = "x"; then
        AC_MSG_ERROR(Unable to find bonobo servers file directory)
     fi