evolution-rss r313 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Mon Jun 30 14:51:25 2008
New Revision: 313
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=313&view=rev

Log:
2008-06-30  Lucian Langa  <lucilanga gnome org>

* fix cflags for WebKitGtk (older webkit)
* older webkit fallback

Modified:
   trunk/configure.ac
   trunk/src/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Jun 30 14:51:25 2008
@@ -239,8 +239,8 @@
 if test "x$have_webkit" == "xno"; then
 	PKG_CHECK_MODULES([WebKitGtk], WebKitGtk, [have_webkit=yes], [have_webkit=no])
 	AC_DEFINE_UNQUOTED(WEBKIT_UNSTD, 1, [unstandard webkit installation])
-	AC_SUBST([WebKitGtk_CFLAGS])
-	AC_SUBST([WebKitGtk_LIBS])
+	WEBKIT_CFLAGS=$WebKitGtk_CFLAGS
+	WEBKIT_LIBS=$WebKitGtk_LIBS
 fi
 AC_SUBST([WEBKIT_CFLAGS])
 AC_SUBST([WEBKIT_LIBS])
@@ -251,7 +251,7 @@
 	AC_DEFINE_UNQUOTED(HAVE_WEBKIT,1, [webkit render engine present])
 	AC_SUBST(HAVE_RENDERKIT)
 	AC_SUBST(HAVE_WEBKIT)
-	RENDER_CFLAGS="$RENDER_CFLAGS $WEBKIT_CFLAGS $WebKitGtk_CFLAGS" 
+	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)]),

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Jun 30 14:51:25 2008
@@ -64,7 +64,7 @@
 plugin_LTLIBRARIES = liborg-gnome-evolution-rss.la
 
 liborg_gnome_evolution_rss_la_SOURCES = rss.c gecko-utils.cpp
-liborg_gnome_evolution_rss_la_LDFLAGS = -module -avoid-version $(WEBKIT_LIBS) $(WebKitGtk_LIBS) $(GECKO_LIBS) $(GECKO_RPATH)
+liborg_gnome_evolution_rss_la_LDFLAGS = -module -avoid-version $(WEBKIT_LIBS) $(GECKO_LIBS) $(GECKO_RPATH)
 
 evolution_import_rss_SOURCES = evolution-import-rss.c
 evolution_import_rss_LDFLAGS = $(DBUS_LIBS)