evolution-rss r256 - in trunk: . m4 src

[lucilanga svn gnome org]

Author: lucilanga
Date: Sun May  4 16:23:29 2008
New Revision: 256
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=256&view=rev

Log:
fix build against libxul

Modified:
   trunk/configure.ac
   trunk/m4/gecko.m4
   trunk/src/Makefile.am
   trunk/src/Makefile.in
   trunk/src/rss.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun May  4 16:23:29 2008
@@ -188,8 +188,10 @@
 		AC_DEFINE_UNQUOTED(HAVE_GTKMOZEMBED,1, [gtkmozembed render engine present])
 		AC_SUBST(HAVE_RENDERKIT)
 		AC_SUBST(HAVE_GTKMOZEMEBED)
-		RENDER_CFLAGS="$GECKO_CFLAGS -I$GECKO_INCLUDE_ROOT" 
-		GECKO_RPATH="-Wl,--rpath -Wl,"$GECKO_HOME
+#		RENDER_CFLAGS="$GECKO_CFLAGS -I$GECKO_INCLUDE_ROOT" 
+		RENDER_CFLAGS=$GECKO_CFLAGS 
+		GECKO_RPATH="-Wl,--rpath -Wl,"$GECKO_LIBDIR
+		GECKO_HOME=$GECKO_LIBDIR
 		AC_SUBST([GECKO_RPATH])
 	
 			if test "x$GECKO" == "xxulrunner"; then

Modified: trunk/m4/gecko.m4
==============================================================================
--- trunk/m4/gecko.m4	(original)
+++ trunk/m4/gecko.m4	Sun May  4 16:23:29 2008
@@ -61,7 +61,8 @@
 gecko_cv_gecko=$with_gecko
 
 # Autodetect gecko
-_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding libxul"
+_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul"
+#_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding libxul"
 if test -z "$gecko_cv_gecko"; then
 	for lizard in $_geckos; do
 		if $PKG_CONFIG --exists $lizard-xpcom; then

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun May  4 16:23:29 2008
@@ -64,8 +64,7 @@
 plugin_LTLIBRARIES = liborg-gnome-evolution-rss.la
 
 liborg_gnome_evolution_rss_la_SOURCES = rss.c
-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) $(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	Sun May  4 16:23:29 2008
@@ -340,8 +340,7 @@
 
 plugin_LTLIBRARIES = liborg-gnome-evolution-rss.la
 liborg_gnome_evolution_rss_la_SOURCES = rss.c
-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) $(GECKO_LIBS) $(GECKO_RPATH)
 evolution_import_rss_SOURCES = evolution-import-rss.c
 evolution_import_rss_LDFLAGS = $(DBUS_LIBS)
 schemadir = $(GCONF_SCHEMA_FILE_DIR)

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Sun May  4 16:23:29 2008
@@ -1640,7 +1640,6 @@
 			rf->test++;
 		}*/
 
-		g_print("DUDICI\n");
 		rf->mozembed = gtk_moz_embed_new();
 
 		/* FIXME add all those profile shits */