Add configure option for Tracker

diff --git a/configure.ac b/configure.ac
index 3658e6e927d6e75c5f1f65c4359c8f6e7d3a212c..1e60941887928c11c6084221f5055ca6c21ca013 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -184,6 +184,9 @@ AC_NETATALK_SENDFILE
 dnl Check whether bundled libevent shall not be used
 AC_NETATALK_LIBEVENT
 
+dnl Check for Tracker
+AC_NETATALK_SPOTLIGHT
+
 dnl FHS stuff has to be done last because it overrides other defaults
 AC_NETATALK_FHS
 

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index e6f7dc5746209e11acfb75826274ace76c446c05..744dd26fdb9df331fa6a45244c812d79633cdd75 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -84,10 +84,8 @@ spot_LDADD = $(top_builddir)/libatalk/libatalk.la
 moduledir = @UAMS_PATH@
 module_LTLIBRARIES = mod_spotlight.la
 
+if HAVE_TRACKER
 mod_spotlight_la_SOURCES = spotlight_module.c
-mod_spotlight_la_CFLAGS  = \
-       -DDBUS_API_SUBJECT_TO_CHANGE \
-       -pthread -I/usr/include/tracker-0.12 -I/usr/include/tracker-0.12/libtracker-sparql -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-mod_spotlight_la_LDFLAGS = \
-       -module -avoid-version \
-       -Wl,--export-dynamic -pthread -ltracker-sparql-0.12 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0  
+mod_spotlight_la_CFLAGS  = -DDBUS_API_SUBJECT_TO_CHANGE @TRACKER_CFLAGS@
+mod_spotlight_la_LDFLAGS = -module -avoid-version @TRACKER_LIBS@
+endif

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 3e57077827de55f35b726b83318ff9b1dd2131ff..8832590e7706647241869a76f239e9a121bfdf79 100644 (file)
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -11,6 +11,28 @@ AC_DEFUN([AC_DEVELOPER], [
     )
     AC_MSG_RESULT([$enable_dev])
     AM_CONDITIONAL(DEVELOPER, test x"$enable_dev" = x"yes")
+
+dnl Tracker, for Spotlight
+AC_DEFUN([AC_NETATALK_SPOTLIGHT], [
+    ac_cv_tracker_pkg_default=tracker-sparql-0.12
+    AC_ARG_WITH([tracker-pkg-config],
+       [AS_HELP_STRING([--with-tracker-pkg-config],[name of the Tracker SPARQL pkg in pkg-config])],
+       [ac_cv_tracker_pkg=$withval],
+       [ac_cv_tracker_pkg=$ac_cv_tracker_pkg_default])
+
+    AC_MSG_NOTICE([searching for $ac_cv_tracker_pkg])
+
+    PKG_CHECK_MODULES([TRACKER], [$ac_cv_tracker_pkg >= 0.12], [ac_cv_have_tracker=yes], [ac_cv_have_tracker=no])
+
+    if test x"$ac_cv_have_tracker" = x"no" ; then
+        if test x"$need_tracker" = x"yes" ; then
+            AC_MSG_ERROR([$ac_cv_tracker_pkg not found])
+       fi
+    fi
+
+    AC_SUBST(TRACKER_CFLAGS)
+    AC_SUBST(TRACKER_LIBS)
+    AM_CONDITIONAL(HAVE_TRACKER, [test x"$ac_cv_have_tracker" = x"yes"])
 ])
 
 dnl Whether to disable bundled libevent
@@ -25,7 +47,10 @@ AC_DEFUN([AC_NETATALK_LIBEVENT], [
     )
 
     if test x"$use_bundled_libevent" = x"yes" ; then
+        AC_MSG_RESULT([no])
         AC_CONFIG_SUBDIRS([libevent])
+    else
+        AC_MSG_RESULT([yes])
     fi
     AM_CONDITIONAL(USE_BUILTIN_LIBEVENT, test x"$use_bundled_libevent" = x"yes")
 ])

diff --git a/macros/summary.m4 b/macros/summary.m4
index a618cf31ccacca089ec2e3a67b9b78038c0af9e9..b3eba270c8bb6765a307ae283a4450a6fb9d5d3f 100644 (file)
--- a/macros/summary.m4
+++ b/macros/summary.m4
@@ -12,6 +12,7 @@ AC_DEFUN([AC_NETATALK_CONFIG_SUMMARY], [
        AC_MSG_RESULT([    AFP:])
        AC_MSG_RESULT([         Extended Attributes: $neta_cv_eas])
        AC_MSG_RESULT([         ACL support: $with_acl_support])
+       AC_MSG_RESULT([         Spotligh: $ac_cv_have_tracker])
        AC_MSG_RESULT([    CNID:])
        AC_MSG_RESULT([         backends: $compiled_backends])
        AC_MSG_RESULT([    UAMS:])