]> arthur.barton.de Git - netatalk.git/commitdiff
Merge remote-tracking branch 'origin/develop' into spotlight
authorRalph Boehme <sloowfranklin@gmail.com>
Sun, 24 Feb 2013 17:37:30 +0000 (18:37 +0100)
committerRalph Boehme <sloowfranklin@gmail.com>
Sun, 24 Feb 2013 17:37:30 +0000 (18:37 +0100)
1  2 
macros/netatalk.m4
macros/summary.m4

diff --combined macros/netatalk.m4
index ddaa2521408779f1ca88f824ebd241cae05c8b77,f77233b5a145504873ec2baf8b42b7b0c5c4fb40..731808e4efc352e69a22e74bdc418df5940b3105
@@@ -35,6 -35,7 +35,7 @@@ AC_DEFUN([AC_NETATALK_DTRACE], 
  
  dnl Check for dbus-glib, for AFP stats
  AC_DEFUN([AC_NETATALK_DBUS_GLIB], [
+     atalk_cv_with_dbus=no
      PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1, have_dbus=yes, have_dbus=no)
      PKG_CHECK_MODULES(DBUS_GLIB, gobject-2.0 >= 2.6, have_dbus_glib=yes, have_dbus_glib=no)
      PKG_CHECK_MODULES(DBUS_GTHREAD, gthread-2.0, have_dbus_gthread=yes, have_dbus_gthread=no)
      AC_SUBST(DBUS_GLIB_LIBS)
      AC_SUBST(DBUS_GTHREAD_CFLAGS)
      AC_SUBST(DBUS_GTHREAD_LIBS)
-     AM_CONDITIONAL(HAVE_DBUS_GLIB, test x$have_dbus_glib = xyes -a x$have_dbus = xyes)
+     if test x$have_dbus_glib = xyes -a x$have_dbus = xyes -a x$have_dbus_gthread = xyes ; then
+         atalk_cv_with_dbus=yes
+     fi
+     AM_CONDITIONAL(HAVE_DBUS_GLIB, test x$atalk_cv_with_dbus = xyes)
  
      AC_ARG_WITH(
          dbus-sysconf-dir,
@@@ -53,7 -57,7 +57,7 @@@
          ac_cv_dbus_sysdir='${sysconfdir}/dbus-1/system.d'
      )
  
-     if test x$have_dbus_glib = xyes -a x$have_dbus = xyes ; then
+     if test x$atalk_cv_with_dbus = xyes ; then
          AC_DEFINE(HAVE_DBUS_GLIB, 1, [Define if support for dbus-glib was found])
          DBUS_SYS_DIR="$ac_cv_dbus_sysdir"
          AC_SUBST(DBUS_SYS_DIR)
@@@ -73,63 -77,6 +77,63 @@@ AC_DEFUN([AC_DEVELOPER], 
      AM_CONDITIONAL(DEVELOPER, test x"$enable_dev" = x"yes")
  ])
  
 +dnl Tracker, for Spotlight
 +AC_DEFUN([AC_NETATALK_SPOTLIGHT], [
 +    ac_cv_have_tracker=no
 +    dnl Tracker SPARQL
 +    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])
 +
 +    PKG_CHECK_MODULES([TRACKER], [$ac_cv_tracker_pkg >= 0.12], [ac_cv_have_tracker_sparql=yes], [ac_cv_have_tracker_sparql=no])
 +
 +    if test x"$ac_cv_have_tracker_sparql" = x"no" ; then
 +        if test x"$need_tracker" = x"yes" ; then
 +            AC_MSG_ERROR([$ac_cv_tracker_pkg not found])
 +        fi
 +    else
 +        AC_DEFINE(HAVE_TRACKER, 1, [Define if Tracker is available])
 +        AC_DEFINE(HAVE_TRACKER_SPARQL, 1, [Define if Tracker SPARQL is available])
 +        ac_cv_tracker_prefix=`pkg-config --variable=prefix $ac_cv_tracker_pkg`
 +        AC_DEFINE_UNQUOTED(TRACKER_PREFIX, ["$ac_cv_tracker_prefix"], [Path to Tracker])
 +      fi
 +
 +    ac_cv_tracker_miner_pkg_default=tracker-miner-0.12
 +    AC_ARG_WITH([tracker-miner-pkg-config],
 +      [AS_HELP_STRING([--with-tracker-miner-pkg-config],[name of the Tracker miner pkg in pkg-config])],
 +      [ac_cv_tracker_miner_pkg=$withval],
 +      [ac_cv_tracker_miner_pkg=$ac_cv_tracker_miner_pkg_default])
 +
 +    PKG_CHECK_MODULES([TRACKER_MINER], [$ac_cv_tracker_miner_pkg >= 0.12], [ac_cv_have_tracker_miner=yes], [ac_cv_have_tracker_miner=no])
 +
 +    if test x"$ac_cv_have_tracker_miner" = x"yes" ; then
 +        AC_DEFINE(HAVE_TRACKER_MINER, 1, [Define if Tracker miner library is available])
 +        AC_SUBST(TRACKER_MINER_CFLAGS)
 +        AC_SUBST(TRACKER_MINER_LIBS)
 +      fi
 +
 +    dnl Test for Tracker 0.6 on Solaris and derived platforms
 +    if test x"$this_os" = x"solaris" ; then
 +        PKG_CHECK_MODULES([TRACKER], [tracker >= 0.6], [ac_cv_have_tracker_rdf=yes], [ac_cv_have_tracker_rdf=no])
 +        if test x"$ac_cv_have_tracker_rdf" = x"yes" ; then
 +            AC_DEFINE(HAVE_TRACKER, 1, [Define if Tracker is available])
 +            AC_DEFINE(HAVE_TRACKER_RDF, 1, [Define if Tracker 0.6 with support for RDF queries is available])
 +            ac_cv_tracker_prefix=`pkg-config --variable=prefix tracker`
 +            AC_DEFINE_UNQUOTED(TRACKER_RDF_PREFIX, ["$ac_cv_tracker_prefix"], [Path to Tracker])
 +          fi
 +    fi
 +
 +    if test x"$ac_cv_have_tracker_sparql" = x"yes" -o x"$ac_cv_have_tracker_rdf" = x"yes" ; then
 +       ac_cv_have_tracker=yes
 +    fi
 +    AC_SUBST(TRACKER_CFLAGS)
 +    AC_SUBST(TRACKER_LIBS)
 +    AM_CONDITIONAL(HAVE_TRACKER_SPARQL, [test x"$ac_cv_have_tracker_sparql" = x"yes"])
 +    AM_CONDITIONAL(HAVE_TRACKER_RDF, [test x"$ac_cv_have_tracker_rdf" = x"yes"])
 +])
 +
  dnl Whether to disable bundled libevent
  AC_DEFUN([AC_NETATALK_LIBEVENT], [
      AC_MSG_CHECKING([whether to use bundled libevent])
diff --combined macros/summary.m4
index edb136c2e170a151c25e81617612e3fcd033cb2c,7f5e649991a0da5fe80f486f12383980ad3ee33c..b5093a04b5bd3f80438eb63016df312e43a4ae4a
@@@ -9,12 -9,9 +9,10 @@@ AC_DEFUN([AC_NETATALK_CONFIG_SUMMARY], 
        else
                AC_MSG_RESULT([         none])
        fi
-       AC_MSG_RESULT([    Netatalk lockfile:])
-       AC_MSG_RESULT([         $ac_cv_netatalk_lock])
        AC_MSG_RESULT([    AFP:])
        AC_MSG_RESULT([         Extended Attributes: $neta_cv_eas])
        AC_MSG_RESULT([         ACL support: $with_acl_support])
 +      AC_MSG_RESULT([         Spotlight: $ac_cv_have_tracker])
        AC_MSG_RESULT([    CNID:])
        AC_MSG_RESULT([         backends: $compiled_backends])
        AC_MSG_RESULT([    UAMS:])
@@@ -56,17 -53,24 +54,24 @@@ dnl        AC_MSG_RESULT([         Samba share
        AC_MSG_RESULT([         ACL support:             $with_acl_support])
        AC_MSG_RESULT([         Kerberos support:        $with_kerberos])
        AC_MSG_RESULT([         LDAP support:            $netatalk_cv_ldap])
-       AC_MSG_RESULT([         dbus support:            $have_dbus_glib])
-       AC_MSG_RESULT([         dbus system directory:   $ac_cv_dbus_sysdir])
+       AC_MSG_RESULT([         dbus support:            $atalk_cv_with_dbus])
        AC_MSG_RESULT([         dtrace probes:           $WDTRACE])
-       if test x"$use_pam_so" = x"yes" -a x"$netatalk_cv_install_pam" = x"no"; then
+       AC_MSG_RESULT([    Paths:])
+       AC_MSG_RESULT([         Netatalk lockfile:       $ac_cv_netatalk_lock])
+       if test x"$atalk_cv_with_dbus" = x"yes"; then
+               AC_MSG_RESULT([         dbus system directory:   $ac_cv_dbus_sysdir])
+       fi
+       if test x"$use_pam_so" = x"yes"; then
+          if test x"$netatalk_cv_install_pam" = x"yes"; then
+               AC_MSG_RESULT([         pam config directory:    $ac_cv_pamdir])
+          else
                AC_MSG_RESULT([])
                AC_MSG_WARN([ PAM support was configured for your system, but the netatalk PAM configuration file])
                AC_MSG_WARN([ cannot be installed. Please install the config/netatalk.pamd file manually.])
                AC_MSG_WARN([ If you're running Solaris or BSD you'll have to edit /etc/pam.conf to get PAM working.])
                AC_MSG_WARN([ You can also re-run configure and specify --without-pam to disable PAM support.])
+          fi
        fi
  ])