[evolution-rss] Some symbols are in libevolution-mail-shared-0.dll on evolution trunk.
- From: Fridrich Strba <strba src gnome org>
- To: svn-commits-list gnome org
- Subject: [evolution-rss] Some symbols are in libevolution-mail-shared-0.dll on evolution trunk.
- Date: Fri, 5 Jun 2009 14:43:53 -0400 (EDT)
commit 667ce10f2c4cee758404fdd4641fe979bc56d605
Author: Fridrich Strba <fridrich strba bluewin ch>
Date: Fri Jun 5 14:11:35 2009 +0200
Some symbols are in libevolution-mail-shared-0.dll on evolution trunk.
---
configure.ac | 12 +++++++++---
src/Makefile.am | 3 ++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index e1b9843..3aa5f19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -296,10 +296,16 @@ case "$host" in
*-mingw*)
os_win32=yes
NO_UNDEFINED='-no-undefined'
- NO_UNDEFINED_LIBS='$(EVOLUTION_RSS_EPLUGIN_LIBS) -levolution-mail -lemiscwidgets'
+ evolution_int_version="$(echo "$EVOLUTION_EXEC_VERSION" | $AWK -F . '{print [$]1 * 10000 + [$]2 * 100 + [$]3}')"
+ echo $evolution_int_version
+ if test $evolution_int_version -ge 22700; then
+ NO_UNDEFINED_LIBS='$(EVOLUTION_RSS_EPLUGIN_LIBS) -levolution-mail-shared -lemiscwidgets'
+ else
+ NO_UNDEFINED_LIBS='$(EVOLUTION_RSS_EPLUGIN_LIBS) -levolution-mail -lemiscwidgets'
+ fi
SOEXT='.dll'
- PLUGINDIR_IN_SERVER_FILE="../../../lib/evolution/$EVOLUTION_EXEC_VERSION/plugins"
- IMAGESDIR_IN_SERVER_FILE="../../../share/evolution/$EVOLUTION_EXEC_VERSION/images"
+ PLUGINDIR_IN_SERVER_FILE="../../../lib/evolution/$EVOLUTION_EXEC_VERSION/plugins"
+ IMAGESDIR_IN_SERVER_FILE="../../../share/evolution/$EVOLUTION_EXEC_VERSION/images"
;;
*) os_win32=no
NO_UNDEFINED=''
diff --git a/src/Makefile.am b/src/Makefile.am
index bc4fee4..694a740 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,7 +86,8 @@ SOURCES+= dbus.c
endif
liborg_gnome_evolution_rss_la_SOURCES = $(SOURCES)
-liborg_gnome_evolution_rss_la_LDFLAGS = -module -avoid-version $(WEBKIT_LIBS) $(GECKO_LIBS) $(LIBSOUP_LIBS) $(NO_UNDEFINED_LIBS) $(NO_UNDEFINED)
+liborg_gnome_evolution_rss_la_LIBADD = $(WEBKIT_LIBS) $(GECKO_LIBS) $(LIBSOUP_LIBS) $(NO_UNDEFINED_LIBS)
+liborg_gnome_evolution_rss_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
#$(GECKO_RPATH)
evolution_import_rss_SOURCES = evolution-import-rss.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]