evolution-rss r312 - in trunk: . pixmaps src

[lucilanga svn gnome org]

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

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

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

Modified:
   trunk/ChangeLog
   trunk/Makefile.in
   trunk/configure.ac
   trunk/pixmaps/Makefile.in
   trunk/src/Makefile.am
   trunk/src/Makefile.in

Modified: trunk/Makefile.in
==============================================================================
--- trunk/Makefile.in	(original)
+++ trunk/Makefile.in	Mon Jun 30 14:47:56 2008
@@ -222,6 +222,8 @@
 WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
 WEBKIT_LIBS = @WEBKIT_LIBS@
 WEBKIT_UNSTD = @WEBKIT_UNSTD@
+WebKitGtk_CFLAGS = @WebKitGtk_CFLAGS@
+WebKitGtk_LIBS = @WebKitGtk_LIBS@
 XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Jun 30 14:47:56 2008
@@ -237,8 +237,10 @@
 if test "$enable_webkit" = "yes"; then
 PKG_CHECK_MODULES([WEBKIT], webkit-1.0, [have_webkit=yes], [have_webkit=no])
 if test "x$have_webkit" == "xno"; then
-	PKG_CHECK_MODULES([older WEBKIT], WebKitGtk, [have_webkit=yes], [have_webkit=no])
+	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])
 fi
 AC_SUBST([WEBKIT_CFLAGS])
 AC_SUBST([WEBKIT_LIBS])
@@ -249,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" 
+	RENDER_CFLAGS="$RENDER_CFLAGS $WEBKIT_CFLAGS $WebKitGtk_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/pixmaps/Makefile.in
==============================================================================
--- trunk/pixmaps/Makefile.in	(original)
+++ trunk/pixmaps/Makefile.in	Mon Jun 30 14:47:56 2008
@@ -203,6 +203,8 @@
 WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
 WEBKIT_LIBS = @WEBKIT_LIBS@
 WEBKIT_UNSTD = @WEBKIT_UNSTD@
+WebKitGtk_CFLAGS = @WebKitGtk_CFLAGS@
+WebKitGtk_LIBS = @WebKitGtk_LIBS@
 XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Mon Jun 30 14:47:56 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) $(GECKO_LIBS) $(GECKO_RPATH)
+liborg_gnome_evolution_rss_la_LDFLAGS = -module -avoid-version $(WEBKIT_LIBS) $(WebKitGtk_LIBS) $(GECKO_LIBS) $(GECKO_RPATH)
 
 evolution_import_rss_SOURCES = evolution-import-rss.c
 evolution_import_rss_LDFLAGS = $(DBUS_LIBS)

Modified: trunk/src/Makefile.in
==============================================================================
--- trunk/src/Makefile.in	(original)
+++ trunk/src/Makefile.in	Mon Jun 30 14:47:56 2008
@@ -257,6 +257,8 @@
 WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
 WEBKIT_LIBS = @WEBKIT_LIBS@
 WEBKIT_UNSTD = @WEBKIT_UNSTD@
+WebKitGtk_CFLAGS = @WebKitGtk_CFLAGS@
+WebKitGtk_LIBS = @WebKitGtk_LIBS@
 XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@