[evolution-rss] fix soup jar sqlite requirements

[Lucian Langa <lucilanga src gnome org>]

commit cf951d5bd19e5d90acd80860bee7d658c9cff852
Author: Lucian Langa <lucilanga gnome org>
Date:   Tue Aug 25 17:02:00 2009 +0300

    fix soup jar sqlite requirements

 TODO                     |    1 +
 configure.ac             |   10 ++++++----
 src/rss-config-factory.c |    4 ++++
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/TODO b/TODO
index 4034b19..70e9664 100644
--- a/TODO
+++ b/TODO
@@ -41,3 +41,4 @@
 	* check feed_folders for errors
 	* check rss_delete_feed for race condition when deletion of camel folder
 	* folder delete should delete feed_folders allocation
+	* fix folder rename (rename all components in feed_folders searching by folder/)
diff --git a/configure.ac b/configure.ac
index 39bb084..cac81ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,8 +164,9 @@ if test "x$have_gecko" != "xno"; then
         AC_MSG_RESULT([$gecko_cv_have_xpcom_glue])
 #               	CPPFLAGS="$_SAVE_CPPFLAGS"
 		AC_ARG_WITH([primary-render],
-        		AS_HELP_STRING([--with-primary-render],[Forces Gecko to be the primary html renderer  @<:@=gecko|webkit@:>@ (default:gtkHTML)]),
-        			[RENDER=$with_primary_render], [RENDER=gtkhtml])
+        	[AS_HELP_STRING([--with-primary-render],
+		[Forces Gecko or Webkit to be the primary html renderer [default:gtkHTML]])],
+       		[RENDER=$with_primary_render], [RENDER=gtkhtml])
 		if test "$RENDER" != "gtkhtml" -a "x$RENDER" == "xgecko"; then
 			AC_MSG_NOTICE([$RENDER set as primary HTML render])
 			RENDER_N=2
@@ -216,8 +217,9 @@ if test "x$have_webkit" != "xno"; then
 	RENDER_CFLAGS="$RENDER_CFLAGS $WEBKIT_CFLAGS" 
 	if test "x$RENDER" != "xgecko"; then
 		AC_ARG_WITH([primary-render],
-        		AS_HELP_STRING([--with-primary-render],[Forces Gecko to be the primary html renderer  @<:@=gecko|webkit@:>@ (default:gtkHTML)]),
-        			[RENDER=$with_primary_render], [RENDER=gtkhtml])
+        	[AS_HELP_STRING([--with-primary-render=@<:@gecko/webkit/gtkhtml@:>@],
+		[Forces Gecko or Webkit to be the primary html renderer [default:gtkhtml]])],
+       		[RENDER=$with_primary_render], [RENDER=gtkhtml])
 		if test "$RENDER" != "gtkhtml" -a "x$RENDER" == "xwebkit"; then
 			AC_MSG_NOTICE([$RENDER set as primary HTML render])
 			RENDER_N=1
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index 67abc8e..78c4b7c 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -1788,6 +1788,7 @@ SoupCookieJar *
 import_cookies(gchar *file)
 {
 	SoupCookieJar *jar = NULL;
+#if LIBSOUP_VERSION > 2026002
 	gchar header[16];
 	memset(header, 0, 16);
 	d(g_print("import cookies from %s\n", file));
@@ -1798,10 +1799,13 @@ import_cookies(gchar *file)
 		if (!g_ascii_strncasecmp(header, SQLITE_MAGIC, sizeof(SQLITE_MAGIC))) {
 #if LIBSOUP_VERSION > 2026002 && defined(HAVE_LIBSOUP_GNOME)
 			jar = soup_cookie_jar_sqlite_new(file, TRUE);
+#else
+			g_print("Importing sqlite format requires libsoup-gnome\n");
 #endif
 		} else
 			jar = soup_cookie_jar_text_new(file, TRUE);
 	}
+#endif
 	return jar;
 }