f-spot r4668 - trunk

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Tue Dec 16 09:06:34 2008
New Revision: 4668
URL: http://svn.gnome.org/viewvc/f-spot?rev=4668&view=rev

Log:
2008-12-16  Stephane Delcroix  <sdelcroix novell com>

	* configure.in: require gio-sharp, whatever the libgnome version

Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Dec 16 09:06:34 2008
@@ -81,24 +81,18 @@
 CSC_DEFINES=""
 PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= 2.8)
 
-dnl -- gio-sharp: needed if gnome >= 2.22. link or bundle ?
-if pkg-config --atleast-version=2.22 libgnome-2.0; then
-	if pkg-config --atleast-version=2.16 gio-sharp-2.0; then
-		LINK_GIO="-pkg:gio-sharp-2.0"
-		DIR_GIO=""
-		PATH_GIO=""
-	else
-		LINK_GIO='-r:$(top_builddir)/gio-sharp/gio/gio-sharp.dll'
-		DIR_GIO="gio-sharp"
-		AC_CONFIG_SUBDIRS([gio-sharp])
-		PATH_GIO='../gio-sharp/gio:'
-	fi
-	CSC_DEFINES="$CSC_DEFINES -d:GIO_2_16"
-else
-	LINK_GIO=""
+dnl -- gio-sharp: link or bundle ?
+if pkg-config --atleast-version=2.16 gio-sharp-2.0; then
+	LINK_GIO="-pkg:gio-sharp-2.0"
 	DIR_GIO=""
 	PATH_GIO=""
+else
+	LINK_GIO='-r:$(top_builddir)/gio-sharp/gio/gio-sharp.dll'
+	DIR_GIO="gio-sharp"
+	AC_CONFIG_SUBDIRS([gio-sharp])
+	PATH_GIO='../gio-sharp/gio:'
 fi
+CSC_DEFINES="$CSC_DEFINES -d:GIO_2_16"
 
 AC_SUBST(LINK_GIO)
 AC_SUBST(DIR_GIO)