[tracker/needle: 47/53] tracker-needle: Adapt to recent configure-for-binaries merge to master

[Martyn James Russell <mr src gnome org>]

commit 6e5aaa7172eb8be1d6e75f812140c60b99f4e5f2
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Oct 27 16:03:20 2010 +0100

    tracker-needle: Adapt to recent configure-for-binaries merge to master

 configure.ac                   |   33 +++++++++++++++++++
 src/tracker-needle/Makefile.am |   68 +++++++++++++++++++---------------------
 2 files changed, 65 insertions(+), 36 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 965b54b..3239760 100644
--- a/configure.ac
+++ b/configure.ac
@@ -402,6 +402,19 @@ TRACKER_UTILS_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
 
 PKG_CHECK_MODULES(TRACKER_UTILS, [$TRACKER_UTILS_REQUIRED])
 
+# Check requirements for tracker-needle
+TRACKER_NEEDLE_REQUIRED="glib-2.0     >= $GLIB_REQUIRED
+                         gio-unix-2.0 >= $GLIB_REQUIRED
+                         gthread-2.0  >= $GLIB_REQUIRED
+                         gmodule-2.0  >= $GLIB_REQUIRED
+                         gtk+-2.0     >= $GTK_REQUIRED
+                         dbus-1       >= $DBUS_REQUIRED
+                         dbus-glib-1  >= $DBUS_GLIB_REQUIRED"
+
+PKG_CHECK_MODULES(TRACKER_NEEDLE, [$TRACKER_NEEDLE_REQUIRED],
+                  [have_tracker_needle=yes],
+                  [have_tracker_needle=no])
+
 # Check requirements for tracker-search-tool
 TRACKER_SEARCH_TOOL_REQUIRED="glib-2.0       >= $GLIB_REQUIRED
                               gio-unix-2.0   >= $GLIB_REQUIRED
@@ -1257,6 +1270,25 @@ fi
 AM_CONDITIONAL(HAVE_TRACKER_SEARCH_BAR, test "$have_tracker_search_bar" = "yes")
 
 ##################################################################
+# Check for tracker-needle
+##################################################################
+
+AC_ARG_ENABLE([tracker-needle],
+              AS_HELP_STRING([--enable-tracker-needle],
+                             [enable tracker-needle[[default=auto]]]),,
+              [enable_tracker_needle=auto])
+
+if test "x$enable_tracker_needle" != "xno" ; then
+   if test "x$have_tracker_needle" != "xyes"; then
+      AC_MSG_ERROR([Couldn't find tracker-needle dependencies ($TRACKER_NEEDLE_REQUIRED).])
+   fi
+else
+   have_tracker_needle="no  (disabled)"
+fi
+
+AM_CONDITIONAL(HAVE_TRACKER_NEEDLE, test "$have_tracker_needle" = "yes")
+
+##################################################################
 # Check for tracker-search-tool
 ##################################################################
 
@@ -2145,6 +2177,7 @@ Applications:
 	Build tracker-preferences:              $have_tracker_preferences
 	Build tracker-status-icon:              $have_tracker_status_icon
 	Build tracker-explorer:                 $have_tracker_explorer
+	Build tracker-needle:                   $have_tracker_needle
 	Build tracker-search-bar:               $have_tracker_search_bar
 
 Metadata Extractors:
diff --git a/src/tracker-needle/Makefile.am b/src/tracker-needle/Makefile.am
index 65692e4..69f068b 100644
--- a/src/tracker-needle/Makefile.am
+++ b/src/tracker-needle/Makefile.am
@@ -2,20 +2,35 @@ include $(top_srcdir)/Makefile.decl
 
 bin_PROGRAMS = tracker-needle
 
-tracker_needle_VALASOURCES = 					\
-	tracker-cell-renderer-text.vala				\
-	tracker-config.vala \
-	tracker-needle.vala \
-	tracker-query.vala \
-	tracker-stats.vala \
-	tracker-taglist.vala \
-	tracker-utils.vala \
+AM_CPPFLAGS =                                          \
+	$(BUILD_CFLAGS)                                \
+	-I$(top_srcdir)/src                            \
+	-I$(top_builddir)/src                          \
+	-DTRACKER_UI_DIR=\"$(datadir)/tracker/\"       \
+	-DLOCALEDIR=\""$(localedir)"\"                 \
+	-DSRCDIR=\"$(abs_srcdir)/\"                    \
+	$(TRACKER_NEEDLE_CFLAGS)                       \
+	-include config.h
+
+LDADD =                                                \
+	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
+	$(BUILD_LIBS)                                  \
+	$(TRACKER_NEEDLE_LIBS)
+
+tracker_needle_VALASOURCES =                           \
+	tracker-cell-renderer-text.vala                \
+	tracker-config.vala                            \
+	tracker-needle.vala                            \
+	tracker-query.vala                             \
+	tracker-stats.vala                             \
+	tracker-taglist.vala                           \
+	tracker-utils.vala                             \
 	tracker-view.vala
 
-tracker_needle_SOURCES = 					\
+tracker_needle_SOURCES =                               \
 	$(tracker_needle_VALASOURCES:.vala=.c)
 
-vapi_sources = \
+vapi_sources =                                         \
 	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi \
 	config.vapi
 
@@ -23,37 +38,18 @@ tracker-needle.vala.stamp: $(tracker_needle_VALASOURCES) $(vapi_sources)
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) -g --pkg dbus-glib-1 --pkg gtk+-2.0 $^
 	$(AM_V_GEN)touch $@
 
-tracker_needle_CFLAGS = 					\
-	-DTRACKER_UI_DIR=\"$(datadir)/tracker/\"		\
-	-DLOCALEDIR=\""$(localedir)"\"				\
-	-DSRCDIR=\"$(abs_srcdir)/\"				\
-	-I$(top_srcdir)/src/libtracker-sparql \
-	-I$(top_builddir)/src/libtracker-sparql \
-	$(WARN_CFLAGS)						\
-	$(GCOV_CFLAGS)						\
-	$(TRACKER_APPS_CFLAGS)					\
-	$(TRACKER_VALA_CFLAGS)					\
-	-include config.h
-
-tracker_needle_LDADD = 						\
-	$(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \
-	$(TRACKER_APPS_LIBS)					\
-	$(TRACKER_VALA_LIBS)					\
-	$(GCOV_LIBS)
-
 uidir = $(datadir)/tracker
 ui_DATA = tracker-needle.ui
 
-EXTRA_DIST = 							\
-	$(needle_VALASOURCES) 					\
-	$(ui_DATA)						\
-	config.vapi						\
+BUILT_SOURCES =                                        \
 	tracker-needle.vala.stamp
 
-MAINTAINERCLEANFILES = 						\
-	tracker-needle.vala.stamp 				\
+MAINTAINERCLEANFILES =                                 \
+	$(BUILT_SOURCES)                               \
 	$(tracker_needle_VALASOURCES:.vala=.c)
 
-BUILT_SOURCES = 						\
+EXTRA_DIST =                                           \
+	$(needle_VALASOURCES)                          \
+	$(ui_DATA)                                     \
+	config.vapi                                    \
 	tracker-needle.vala.stamp
-