f-spot r3893 - in trunk: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Fri May  9 10:58:27 2008
New Revision: 3893
URL: http://svn.gnome.org/viewvc/f-spot?rev=3893&view=rev

Log:
2008-05-09  Stephane Delcroix  <sdelcroix novell com>

	* Makefile.am:
	* configure.in:
	* src/f-spot.in: build gio-sharp if needed


Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/src/f-spot.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri May  9 10:58:27 2008
@@ -2,6 +2,7 @@
 	$(DIR_DBUS)	\
 	$(DIR_DBUS_GLIB)\
 	$(DIR_SEMWEB)	\
+	$(DIR_GIO)	\
 	docs		\
 	glitz-sharp	\
 	gnome-keyring-sharp \
@@ -20,6 +21,7 @@
 DIST_SUBDIRS = 		\
 	dbus-sharp	\
 	dbus-sharp-glib	\
+	gio-sharp	\
 	docs		\
 	glitz-sharp	\
 	gnome-keyring-sharp \
@@ -86,6 +88,7 @@
 
 install-data-hook: 
 	$(UPDATE_DESKTOP)
+	cp gio-sharp/gio/gio-sharp.dll gio-sharp/gio/gio-sharp.dll.config $(libdir)/f-spot/
 
 uninstall-hook: 
 	$(UPDATE_DESKTOP)

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri May  9 10:58:27 2008
@@ -86,6 +86,29 @@
 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
+	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=""
+	DIR_GIO=""
+	PATH_GIO=""
+fi
+
+AC_SUBST(LINK_GIO)
+AC_SUBST(DIR_GIO)
+AC_SUBST(PATH_GIO)
+
 if pkg-config --atleast-version=2.10 gtk-sharp-2.0; then
    CSC_DEFINES="$CSC_DEFINES -d:GTK_2_10"
 fi

Modified: trunk/src/f-spot.in
==============================================================================
--- trunk/src/f-spot.in	(original)
+++ trunk/src/f-spot.in	Fri May  9 10:58:27 2008
@@ -41,7 +41,7 @@
 	x--uninstalled)
 	    echo "*** Running uninstalled f-spot ***"
 	    EXE_TO_RUN="./f-spot.exe"
-	    export MONO_PATH= PATH_DBUS@@PATH_SEMWEB   /Tao/Tao.OpenGl:../Tao/Tao.OpenGl.Glu:../Tao/Tao.OpenGl.ExtensionLoader:../google-sharp:../gnome-keyring-sharp:../FlickrNet:../SmugMugNet:../libgphoto2-sharp:../semweb:../glitz-sharp/src/:../mono-addins/Mono.Addins:../mono-addins/Mono.Addins.Setup:../mono-addins/Mono.Addins.Gui:$MONO_PATH
+	    export MONO_PATH= PATH_DBUS@@PATH_SEMWEB@@PATH_GIO   /Tao/Tao.OpenGl:../Tao/Tao.OpenGl.Glu:../Tao/Tao.OpenGl.ExtensionLoader:../google-sharp:../gnome-keyring-sharp:../FlickrNet:../SmugMugNet:../libgphoto2-sharp:../semweb:../glitz-sharp/src/:../mono-addins/Mono.Addins:../mono-addins/Mono.Addins.Setup:../mono-addins/Mono.Addins.Gui:$MONO_PATH
 	    ;;
     esac
 done