f-spot r4182 - in trunk: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Tue Jul 15 10:16:47 2008
New Revision: 4182
URL: http://svn.gnome.org/viewvc/f-spot?rev=4182&view=rev

Log:
remove InfoDisplay from the build, no longer depends on gtkhtml


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

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jul 15 10:16:47 2008
@@ -75,15 +75,6 @@
 
 CSC_DEFINES=""
 PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= 2.8)
-if pkg-config --atleast-version=2.19.90 gnome-sharp-2.0; then
-	PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14 >= 2.19.90)
-	GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-3.14 -pkg:gnome-sharp-2.0"
-	CSC_DEFINES="$CSC_DEFINES -d:GTKHTML_3_14"
-else
-	PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0 >= 2.8)
-	GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-2.0"
-fi
-AC_SUBST(GTKHTML_SHARP_PKG)
 
 dnl -- gio-sharp: needed if gnome >= 2.22. link or bundle ?
 if pkg-config --atleast-version=2.22 libgnome-2.0; then

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Jul 15 10:16:47 2008
@@ -138,7 +138,6 @@
 	$(srcdir)/ImageTest.cs			\
 	$(srcdir)/ImportBackend.cs		\
 	$(srcdir)/ImportCommand.cs		\
-	$(srcdir)/InfoDisplay.cs		\
 	$(srcdir)/InfoOverlay.cs		\
 	$(srcdir)/InternalProcess.cs		\
 	$(srcdir)/IOChannel.cs			\
@@ -323,6 +322,7 @@
 	$(GCONF_PKG)				\
 	$(GTKHTML_SHARP_PKG)			\
 	-pkg:glade-sharp-2.0			\
+	-pkg:gnome-sharp-2.0			\
 	-pkg:gnome-vfs-sharp-2.0
 
 F_SPOT_DISTRESOURCES =			\