[f-spot/FSPOT_0_6_0_STABLE] Fix build for people without a system installed ndesk-dbus.

From: Ruben Vermeersch <rubenv src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [f-spot/FSPOT_0_6_0_STABLE] Fix build for people without a system installed ndesk-dbus.
Date: Tue, 11 Aug 2009 00:08:06 +0000 (UTC)
commit 4f4a645d0cec97aa0b3f1ed49503c6a0e9ddf64c
Author: Ruben Vermeersch <ruben savanne be>
Date:   Tue Aug 11 02:06:51 2009 +0200

    Fix build for people without a system installed ndesk-dbus.
    
    Fixes Bug 591322 â?? v0.6.0.0 doesn't build

 configure.ac                                     |    4 ++--
 extensions/Exporters/CDExport/Makefile.am        |    1 +
 extensions/Exporters/FacebookExport/Makefile.am  |    1 +
 extensions/Exporters/FlickrExport/Makefile.am    |    1 +
 extensions/Exporters/FolderExport/Makefile.am    |    1 +
 extensions/Exporters/GalleryExport/Makefile.am   |    1 +
 extensions/Exporters/PicasaWebExport/Makefile.am |    1 +
 extensions/Exporters/SmugMugExport/Makefile.am   |    1 +
 extensions/Exporters/TabbloExport/Makefile.am    |    1 +
 extensions/Exporters/ZipExport/Makefile.am       |    1 +
 extensions/Services/BeagleService/Makefile.am    |    1 +
 extensions/Tools/ChangePhotoPath/Makefile.am     |    1 +
 extensions/Tools/DevelopInUFraw/Makefile.am      |    1 +
 extensions/Tools/HashJob/Makefile.am             |    1 +
 extensions/Tools/MergeDb/Makefile.am             |    1 +
 extensions/Tools/RawPlusJpeg/Makefile.am         |    1 +
 tests/src/Makefile.am                            |    1 +
 17 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e31bd27..73eae22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,8 +137,8 @@ PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-
 ],
 [
 	LINK_DBUS='-r:$(top_builddir)/lib/dbus-sharp/NDesk.DBus.dll -r:$(top_builddir)/lib/dbus-sharp-glib/NDesk.DBus.GLib.dll'
-	DIR_DBUS="lib/dbus-sharp"
-	DIR_DBUS_GLIB="lib/dbus-sharp-glib"
+	DIR_DBUS="dbus-sharp"
+	DIR_DBUS_GLIB="dbus-sharp-glib"
 	PATH_DBUS='../lib/dbus-sharp:../lib/dbus-sharp-glib:'
 ])
 AC_SUBST(DIR_DBUS)
diff --git a/extensions/Exporters/CDExport/Makefile.am b/extensions/Exporters/CDExport/Makefile.am
index 6bd4fb4..57b24b4 100644
--- a/extensions/Exporters/CDExport/Makefile.am
+++ b/extensions/Exporters/CDExport/Makefile.am
@@ -18,6 +18,7 @@ REFS =					\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GTKSHARPBEANS)			\	
 	$(LINK_GIOSHARP)			\
+	$(LINK_DBUS)				\
 	-r:Mono.Posix
 
 PKGS =					\
diff --git a/extensions/Exporters/FacebookExport/Makefile.am b/extensions/Exporters/FacebookExport/Makefile.am
index 2544555..1dceab8 100644
--- a/extensions/Exporters/FacebookExport/Makefile.am
+++ b/extensions/Exporters/FacebookExport/Makefile.am
@@ -42,6 +42,7 @@ REFS =					\
 	$(LINK_SEMWEB)						\
 	$(LINK_GPHOTO2)						\
 	$(LINK_GIOSHARP)						\
+	$(LINK_DBUS)						\
 	-r:Mono.Posix
 
 PKGS =					\
diff --git a/extensions/Exporters/FlickrExport/Makefile.am b/extensions/Exporters/FlickrExport/Makefile.am
index 2535352..812904c 100644
--- a/extensions/Exporters/FlickrExport/Makefile.am
+++ b/extensions/Exporters/FlickrExport/Makefile.am
@@ -19,6 +19,7 @@ REFS =					\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GIOSHARP)				\
 	$(LINK_GTKSHARPBEANS)		\
+	$(LINK_DBUS)				\
 	-r:FlickrNet/FlickrNet.dll	\
 	-r:Mono.Posix
 
diff --git a/extensions/Exporters/FolderExport/Makefile.am b/extensions/Exporters/FolderExport/Makefile.am
index 704a481..8cacf9e 100644
--- a/extensions/Exporters/FolderExport/Makefile.am
+++ b/extensions/Exporters/FolderExport/Makefile.am
@@ -18,6 +18,7 @@ REFS =					\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GIOSHARP)				\
 	$(LINK_GTKSHARPBEANS)		\
+	$(LINK_DBUS)		\
 	-r:System.Web			\
 	-r:ICSharpCode.SharpZipLib	\
 	-r:Mono.Posix
diff --git a/extensions/Exporters/GalleryExport/Makefile.am b/extensions/Exporters/GalleryExport/Makefile.am
index 55bfdfa..5cc9247 100644
--- a/extensions/Exporters/GalleryExport/Makefile.am
+++ b/extensions/Exporters/GalleryExport/Makefile.am
@@ -19,6 +19,7 @@ REFS =					\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GIOSHARP)				\
 	$(LINK_GTKSHARPBEANS)		\
+	$(LINK_DBUS)				\
 	-r:Mono.Posix
 
 PKGS =					\
diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
index 4b39ee2..45e3bac 100644
--- a/extensions/Exporters/PicasaWebExport/Makefile.am
+++ b/extensions/Exporters/PicasaWebExport/Makefile.am
@@ -19,6 +19,7 @@ REFS =					\
 	$(LINK_MONO_ADDINS)		\
 	$(LINK_GIOSHARP)			\
 	$(LINK_GPHOTO2)			\
+	$(LINK_DBUS)			\
 	-r:System.Web			\
 	-r:Mono.Posix
 
diff --git a/extensions/Exporters/SmugMugExport/Makefile.am b/extensions/Exporters/SmugMugExport/Makefile.am
index 5e2d8b6..397461f 100644
--- a/extensions/Exporters/SmugMugExport/Makefile.am
+++ b/extensions/Exporters/SmugMugExport/Makefile.am
@@ -20,6 +20,7 @@ REFS =					\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GTKSHARPBEANS)		\
 	$(LINK_KEYRING)			\
+	$(LINK_DBUS)			\
 	-r:Mono.Posix
 
 PKGS =					\
diff --git a/extensions/Exporters/TabbloExport/Makefile.am b/extensions/Exporters/TabbloExport/Makefile.am
index b4ffd33..b7465d6 100644
--- a/extensions/Exporters/TabbloExport/Makefile.am
+++ b/extensions/Exporters/TabbloExport/Makefile.am
@@ -29,6 +29,7 @@ REFS = \
 	$(LINK_GIOSHARP)						\
 	$(LINK_GTKSHARPBEANS)		\	
 	$(LINK_GPHOTO2)						\
+	$(LINK_DBUS)						\
 	-r:Mono.Posix.dll
 
 PKGS = \
diff --git a/extensions/Exporters/ZipExport/Makefile.am b/extensions/Exporters/ZipExport/Makefile.am
index b7d3bd3..2038887 100644
--- a/extensions/Exporters/ZipExport/Makefile.am
+++ b/extensions/Exporters/ZipExport/Makefile.am
@@ -16,6 +16,7 @@ REFS =					\
 	$(LINK_SEMWEB)				\
 	$(LINK_MONO_ADDINS)			\
 	$(LINK_GPHOTO2)				\
+	$(LINK_DBUS)				\
 	-r:System.Web			\
 	-r:ICSharpCode.SharpZipLib	\
 	-r:Mono.Posix
diff --git a/extensions/Services/BeagleService/Makefile.am b/extensions/Services/BeagleService/Makefile.am
index 648c945..ca96442 100644
--- a/extensions/Services/BeagleService/Makefile.am
+++ b/extensions/Services/BeagleService/Makefile.am
@@ -19,6 +19,7 @@ REFS =					\
 	$(LINK_SEMWEB)				\
 	$(LINK_GPHOTO2)				\
 	$(LINK_GIOSHARP)			\
+	$(LINK_DBUS)				\
 	$(LINK_BEAGLE)
 
 PKGS =
diff --git a/extensions/Tools/ChangePhotoPath/Makefile.am b/extensions/Tools/ChangePhotoPath/Makefile.am
index 51c6bea..25f84f9 100755
--- a/extensions/Tools/ChangePhotoPath/Makefile.am
+++ b/extensions/Tools/ChangePhotoPath/Makefile.am
@@ -20,6 +20,7 @@ REFS =					\
 	$(LINK_SEMWEB)				\
 	$(LINK_MONO_ADDINS)			\
 	$(LINK_GIOSHARP)			\
+	$(LINK_DBUS)			\
 	$(LINK_GPHOTO2)
 
 PKGS =					\
diff --git a/extensions/Tools/DevelopInUFraw/Makefile.am b/extensions/Tools/DevelopInUFraw/Makefile.am
index b04e742..0401059 100644
--- a/extensions/Tools/DevelopInUFraw/Makefile.am
+++ b/extensions/Tools/DevelopInUFraw/Makefile.am
@@ -19,6 +19,7 @@ REFS =					\
 	$(LINK_MONO_ADDINS)			\
 	$(LINK_GTKSHARPBEANS)			\
 	$(LINK_GIOSHARP)			\
+	$(LINK_DBUS)			\
 	$(LINK_GPHOTO2)
 
 PKGS =					\
diff --git a/extensions/Tools/HashJob/Makefile.am b/extensions/Tools/HashJob/Makefile.am
index 733f100..7e65c49 100644
--- a/extensions/Tools/HashJob/Makefile.am
+++ b/extensions/Tools/HashJob/Makefile.am
@@ -19,6 +19,7 @@ REFS =					\
 	$(LINK_SEMWEB)				\
 	$(LINK_MONO_ADDINS)			\
 	$(LINK_GIOSHARP)			\
+	$(LINK_DBUS)			\
 	$(LINK_GPHOTO2)
 
 PKGS =					\
diff --git a/extensions/Tools/MergeDb/Makefile.am b/extensions/Tools/MergeDb/Makefile.am
index 76220de..ae17a84 100644
--- a/extensions/Tools/MergeDb/Makefile.am
+++ b/extensions/Tools/MergeDb/Makefile.am
@@ -20,6 +20,7 @@ REFS =					\
 	$(LINK_MONO_ADDINS)			\
 	$(LINK_SEMWEB)				\
 	$(LINK_GIOSHARP)				\
+	$(LINK_DBUS)				\
 	$(LINK_GPHOTO2)
 
 PKGS =					\
diff --git a/extensions/Tools/RawPlusJpeg/Makefile.am b/extensions/Tools/RawPlusJpeg/Makefile.am
index c4cb3e9..ff38c46 100644
--- a/extensions/Tools/RawPlusJpeg/Makefile.am
+++ b/extensions/Tools/RawPlusJpeg/Makefile.am
@@ -17,6 +17,7 @@ REFS =					\
 	-r:$(top_builddir)/src/FSpot.Query.dll	\
 	$(LINK_SEMWEB)				\
 	$(LINK_MONO_ADDINS)			\
+	$(LINK_DBUS)			\
 	$(LINK_GPHOTO2)
 
 PKGS =					\
diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index 0cb9272..6ee60de 100644
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -25,6 +25,7 @@ REFS =										\
 	$(LINK_GPHOTO2)							\
 	$(LINK_MONO_ADDINS)						\
 	$(LINK_GIOSHARP)						\
+	$(LINK_DBUS)						\
 	-r:$(top_builddir)/src/f-spot.exe			\
 	-r:$(top_builddir)/src/FSpot.Core.dll		\
 	-r:$(top_builddir)/src/FSpot.Query.dll	\
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]