[tracker/miner-flickr: 13/24] tracker-miner-flickr: Fix optionality

[Adrien Bustany <abustany src gnome org>]

commit 34112a9df5262dcb88cbccdefd1ac63fc4f39ddf
Author: Adrien Bustany <abustany gnome org>
Date:   Wed Mar 24 10:03:13 2010 -0300

    tracker-miner-flickr: Fix optionality

 data/dbus/Makefile.am           |    6 +++++-
 data/icons/scalable/Makefile.am |    6 +++++-
 data/miners/Makefile.am         |    7 +++++--
 3 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/data/dbus/Makefile.am b/data/dbus/Makefile.am
index 60da9c0..c7e6d94 100644
--- a/data/dbus/Makefile.am
+++ b/data/dbus/Makefile.am
@@ -22,8 +22,12 @@ service_in_files =						\
 	org.freedesktop.Tracker1.service.in			\
 	org.freedesktop.Tracker1.Miner.Applications.service.in	\
 	org.freedesktop.Tracker1.Miner.Files.service.in		\
-	org.freedesktop.Tracker1.Miner.Flickr.service.in	\
 	org.freedesktop.Tracker1.Extract.service.in
+
+if HAVE_MINER_FLICKR
+service_in_files += org.freedesktop.Tracker1.Miner.Flickr.service.in
+endif
+
 service_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index 16fd13c..a8310e5 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -4,7 +4,11 @@ icondir = $(datadir)/icons/hicolor/scalable/apps
 icon_DATA = tracker.svg
 
 minericonsdir = $(datadir)/tracker/icons
-minericons_DATA = tracker-miner-flickr.svg
+minericons_DATA =
+
+if HAVE_MINER_FLICKR
+minericons_DATA += tracker-miner-flickr.svg
+endif
 
 EXTRA_DIST = 					\
 	$(icon_DATA)				\
diff --git a/data/miners/Makefile.am b/data/miners/Makefile.am
index 29f8594..edb274c 100644
--- a/data/miners/Makefile.am
+++ b/data/miners/Makefile.am
@@ -9,13 +9,16 @@ tracker_minersdir = $(datadir)/tracker/miners
 
 tracker_miners_DATA = \
 	tracker-miner-applications.desktop \
-	tracker-miner-files.desktop \
-	tracker-miner-flickr.desktop
+	tracker-miner-files.desktop
 
 if USING_MINER_RSS
 tracker_miners_DATA += 	tracker-miner-rss.desktop
 endif
 
+if HAVE_MINER_FLICKR
+tracker_miners_DATA += tracker-miner-flickr.desktop
+endif
+
 @INTLTOOL_DESKTOP_RULE@
 
 %.desktop.in: %.desktop.in.in