f-spot r3878 - in trunk: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Wed May  7 11:13:58 2008
New Revision: 3878
URL: http://svn.gnome.org/viewvc/f-spot?rev=3878&view=rev

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

	* configure.in:
	* Makefile.include:
	* Makefile.am:
	* src/f-spot.in: do not bundle semweb if it's installed on the system.


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

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Wed May  7 11:13:58 2008
@@ -1,6 +1,7 @@
 SUBDIRS = 		\
 	$(DIR_DBUS)	\
 	$(DIR_DBUS_GLIB)\
+	$(DIR_SEMWEB)	\
 	docs		\
 	glitz-sharp	\
 	gnome-keyring-sharp \

Modified: trunk/Makefile.include
==============================================================================
--- trunk/Makefile.include	(original)
+++ trunk/Makefile.include	Wed May  7 11:13:58 2008
@@ -15,7 +15,6 @@
 DIR_KEYRING = $(top_builddir)/gnome-keyring-sharp
 DIR_LIBEOG = $(top_builddir)/libeog
 DIR_LIBFSPOT = $(top_builddir)/libfspot
-DIR_SEMWEB = $(top_builddir)/semweb
 DIR_SRC = $(top_builddir)/src
 DIR_TAO_OPENGL = $(top_builddir)/Tao/Tao.OpenGl
 DIR_TAO_GLU = $(top_builddir)/Tao/Tao.OpenGl.Glu
@@ -31,7 +30,6 @@
 	-r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll		\
 	-r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll	\
 	-r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
 LINK_TAO = 								\
 	-r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll				\
 	-r:$(DIR_TAO_GLU)/Tao.OpenGl.Glu.dll				\

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed May  7 11:13:58 2008
@@ -64,6 +64,7 @@
 BEAGLE_REQUIRED=0.3.0
 NDESK_DBUS_REQUIRED=0.4.2
 NDESK_DBUS_GLIB_REQUIRED=0.3.0
+SEMWEB_REQUIRED=1.05
 MONO_CAIRO_REQUIRED=1.2.4
 dnl -- this check is 	
 LCMS_REQUIRED=1.12
@@ -134,7 +135,7 @@
 dnl -- dbus-sharp: link or bundle ?
 PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED,
 [
-	LINK_DBUS="-pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0"
+	LINK_DBUS="-pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0 "
 	DIR_DBUS=""
 	DIR_DBUS_GLIB=""
 	PATH_DBUS=""
@@ -150,6 +151,22 @@
 AC_SUBST(LINK_DBUS)
 AC_SUBST(PATH_DBUS)
 
+dnl -- semweb: link or bundle ?
+PKG_CHECK_MODULES(SEMWEB, semweb >= $SEMWEB_REQUIRED,
+[
+	LINK_SEMWEB="-pkg:semweb "
+	DIR_SEMWEB=""
+	PATH_SEMWEB=""
+],
+[
+	LINK_SEMWEB='-r:$(top_builddir)/semweb/SemWeb.dll'
+	DIR_SEMWEB="semweb"
+	PATH_SEMWEB='../semweb:'
+])
+AC_SUBST(DIR_SEMWEB)
+AC_SUBST(LINK_SEMWEB)
+AC_SUBST(PATH_SEMWEB)
+
 dnl -- nunit ... workaround for ubuntu
 NUNIT_DEFINES='-d:ENABLE_NUNIT'
 PKG_CHECK_MODULES(MONO_NUNIT, mono-nunit >= $MONO_REQUIRED,

Modified: trunk/src/f-spot.in
==============================================================================
--- trunk/src/f-spot.in	(original)
+++ trunk/src/f-spot.in	Wed May  7 11:13:58 2008
@@ -41,7 +41,7 @@
 	x--uninstalled)
 	    echo "*** Running uninstalled f-spot ***"
 	    EXE_TO_RUN="./f-spot.exe"
-	    export MONO_PATH= PATH_DBUS@../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   /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