[evolution-rss] Adapting to recent changes in evolution trunk

[Fridrich Strba <strba src gnome org>]

commit dfce881732237b3a03a60069807f124038d46ae9
Author: Fridrich Å trba <fridrich strba bluewin ch>
Date:   Fri Apr 16 00:35:15 2010 +0200

    Adapting to recent changes in evolution trunk

 configure.ac   |   10 +++++++---
 src/strptime.c |    5 +++++
 2 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2d4469d..ec5f397 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,10 +353,14 @@ case "$host" in
 *-mingw*)
     os_win32=yes
     NO_UNDEFINED='-no-undefined'
-	if test $evolution_int_version -ge 22700 -a $evolution_int_version -lt 22900; then
-		NO_UNDEFINED_LIBS='$(EVOLUTION_RSS_EPLUGIN_LIBS) -levolution-mail-shared -levolution-mail -lemiscwidgets'
+	if test $evolution_int_version -ge 23100; then
+		NO_UNDEFINED_LIBS='$(EVOLUTION_RSS_EPLUGIN_LIBS) -levolution-mail -lemformat -lemiscwidgets'
 	else
-		NO_UNDEFINED_LIBS='$(EVOLUTION_RSS_EPLUGIN_LIBS) -levolution-mail -lemiscwidgets'
+		if test $evolution_int_version -ge 22700 -a $evolution_int_version -lt 22900; then
+			NO_UNDEFINED_LIBS='$(EVOLUTION_RSS_EPLUGIN_LIBS) -levolution-mail-shared -levolution-mail -lemiscwidgets'
+		else
+			NO_UNDEFINED_LIBS='$(EVOLUTION_RSS_EPLUGIN_LIBS) -levolution-mail -lemiscwidgets'
+		fi
 	fi
     SOEXT='.dll'
 	PLUGINDIR_IN_SERVER_FILE="../../../lib/evolution/$EVOLUTION_EXEC_VERSION/plugins"
diff --git a/src/strptime.c b/src/strptime.c
index ee42789..6570645 100644
--- a/src/strptime.c
+++ b/src/strptime.c
@@ -29,6 +29,11 @@
 #include <time.h>
 #include <stdbool.h>
 
+#ifdef localtime_r
+#undef localtime_r
+#endif
+#define localtime_r(tp,tmp) memcpy(tmp,localtime(tp),sizeof(struct tm))
+
 #define match_char(ch1, ch2) if (ch1 != ch2) return NULL
 
 #define match_string(cs1, s2) \