[evolution-rss] Bug 752197 - Correct undefined cache reaper symbols from the link time

[Milan Crha <mcrha src gnome org>]

commit 125ef46ca9e59ec0796b18a10c2aa6f45de30f05
Author: Milan Crha <mcrha redhat com>
Date:   Thu Aug 13 11:37:53 2015 +0200

    Bug 752197 - Correct undefined cache reaper symbols from the link time

 configure.ac         |   24 +++++++++++++++++-------
 src/Makefile.am      |   10 ++++++++--
 src/module-eds-rss.c |    2 +-
 3 files changed, 26 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4322827..8af0978 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,13 +134,14 @@ fi
 PKG_CHECK_MODULES([EVOLUTION_DATASERVER], evolution-data-server-1.2, [have_ds=yes], [have_ds=no])
 if test "x$have_ds" == "xYES"; then
        DATASERVER_VERSION=`$PKG_CONFIG --modversion evolution-data-server-1.2`
-       DATASERVER_LIBS=`$PKG_CONFIG --libs evolution-data-server-1.2`
 else
        DATASERVER_VERSION=`$PKG_CONFIG --modversion libedataserver-1.2`
-       DATASERVER_LIBS=`$PKG_CONFIG --libs libedataserver-1.2`
 fi
+DATASERVER_CFLAGS=`$PKG_CONFIG --cflags libedataserver-1.2 libebackend-1.2`
+DATASERVER_LIBS=`$PKG_CONFIG --libs libedataserver-1.2 libebackend-1.2`
 DATASERVER_VERSION=`echo $DATASERVER_VERSION|$AWK -F . '{print $1 * 1000000 + $2 * 1000 + $3}'`
 AC_SUBST(DATASERVER_VERSION)
+AC_SUBST(DATASERVER_CFLAGS)
 AC_SUBST(DATASERVER_LIBS)
 
 dnl default renderer
@@ -413,7 +414,7 @@ AC_MSG_CHECKING([for Win32])
 case "$host" in
 *-mingw*)
     os_win32=yes
-    NO_UNDEFINED='-no-undefined'
+    NO_UNDEFINED='-Wl,--no-undefined'
        if test $evolution_int_version -ge 23000; then
                NO_UNDEFINED_LIBS='$(EVOLUTION_RSS_EPLUGIN_LIBS) -levolution-mail -lemiscwidgets -lemformat'
        else
@@ -427,12 +428,21 @@ case "$host" in
        PLUGINDIR_IN_SERVER_FILE="../../../lib/evolution/$EVOLUTION_EXEC_VERSION/plugins"
        IMAGESDIR_IN_SERVER_FILE="../../../share/evolution/$EVOLUTION_EXEC_VERSION/images"
     ;;
-*)  os_win32=no
+*openbsd*|*freebsd*)
+    dnl Do not set '-Wl,--no-undefined' on freebsd/openbsd
+    os_win32=no
     NO_UNDEFINED=''
-       NO_UNDEFINED_LIBS=''
+    NO_UNDEFINED_LIBS=''
+    SOEXT='.so'
+    PLUGINDIR_IN_SERVER_FILE="$PLUGIN_INSTALL_DIR"
+    IMAGESDIR_IN_SERVER_FILE="$ICON_DIR"
+       ;;
+*)  os_win32=no
+    NO_UNDEFINED='-Wl,--no-undefined'
+    NO_UNDEFINED_LIBS=''
     SOEXT='.so'
-       PLUGINDIR_IN_SERVER_FILE="$PLUGIN_INSTALL_DIR"
-       IMAGESDIR_IN_SERVER_FILE="$ICON_DIR"
+    PLUGINDIR_IN_SERVER_FILE="$PLUGIN_INSTALL_DIR"
+    IMAGESDIR_IN_SERVER_FILE="$ICON_DIR"
     ;;
 esac
 AC_MSG_RESULT([$os_win32])
diff --git a/src/Makefile.am b/src/Makefile.am
index b6e3a42..e11a3da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,8 @@ AM_CPPFLAGS =                                                 \
        -DWEBKIT_VERSION="$(WEBKIT_VERSION)"                    \
        -DRENDER=\""$(RENDER)"\"                                \
        -DRENDER_N=$(RENDER_N)                                  \
-       $(EVOLUTION_RSS_EPLUGIN_CFLAGS)
+       $(EVOLUTION_RSS_EPLUGIN_CFLAGS)                         \
+       $(DATASERVER_CFLAGS)
 
 if ! HAVE_XPCOM_GLUE
 AM_CPPFLAGS += -DGECKO_HOME=\""$(GECKO_HOME)"\"
@@ -90,8 +91,13 @@ SOURCES+=    gecko-utils.cpp
 endif
 
 liborg_gnome_evolution_rss_la_SOURCES = $(SOURCES)
-liborg_gnome_evolution_rss_la_LIBADD = $(WEBKIT_LIBS) $(DATASERVER_LIBS) $(GECKO_LIBS) $(LIBSOUP_LIBS) 
$(GTKHTML_EDITOR_LIBS) $(DBUS_LIBS) $(NO_UNDEFINED_LIBS)
+liborg_gnome_evolution_rss_la_LIBADD = $(WEBKIT_LIBS) $(DATASERVER_LIBS) $(GECKO_LIBS) $(LIBSOUP_LIBS) 
$(GTKHTML_EDITOR_LIBS) $(DBUS_LIBS) $(NO_UNDEFINED_LIBS) $(EVOLUTION_RSS_EPLUGIN_LIBS)
 liborg_gnome_evolution_rss_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_evolution_rss_la_CPPFLAGS =               \
+        $(AM_CPPFLAGS)                                 \
+        -I$(top_srcdir)                                        \
+        -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"   \
+        -DG_LOG_DOMAIN=\"org-gnome-evolution-rss\"
 
 evolution_import_rss_SOURCES = evolution-import-rss.c
 evolution_import_rss_LDFLAGS = $(EVOLUTION_RSS_EPLUGIN_LIBS)
diff --git a/src/module-eds-rss.c b/src/module-eds-rss.c
index 2bf26bd..59a74c0 100644
--- a/src/module-eds-rss.c
+++ b/src/module-eds-rss.c
@@ -24,7 +24,7 @@
 #include <gmodule.h>
 
 #include <libedataserver/libedataserver.h>
-#include <cache-reaper/e-cache-reaper.h>
+#include <libebackend/libebackend.h>
 
 /* Standard GObject macros */
 #define E_TYPE_RSS_CACHE_REAPER_EXT \