X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fnetatalk.m4;h=ddaa2521408779f1ca88f824ebd241cae05c8b77;hb=87c02d4df072d4b069b2e75462b2ee95eeb1fe7a;hp=024a0971ca1e3ad1c2b05ddc19aece8065dff0d6;hpb=935187883217fb64a5fb9fc858b93509601d3f32;p=netatalk.git diff --git a/macros/netatalk.m4 b/macros/netatalk.m4 index 024a0971..ddaa2521 100644 --- a/macros/netatalk.m4 +++ b/macros/netatalk.m4 @@ -1,5 +1,65 @@ dnl Kitchen sink for configuration macros +dnl Check for dtrace +AC_DEFUN([AC_NETATALK_DTRACE], [ + AC_ARG_WITH(dtrace, + AS_HELP_STRING( + [--with-dtrace], + [Enable dtrace probes (default: enabled if dtrace found)] + ), + [WDTRACE=$withval], + [WDTRACE=auto] + ) + if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then + AC_CHECK_PROG([atalk_cv_have_dtrace], [dtrace], [yes], [no]) + if test "x$atalk_cv_have_dtrace" = "xno" ; then + if test "x$WDTRACE" = "xyes" ; then + AC_MSG_FAILURE([dtrace requested but not found]) + fi + WDTRACE="no" + else + WDTRACE="yes" + fi + fi + + if test x"$WDTRACE" = x"yes" ; then + AC_DEFINE([WITH_DTRACE], [1], [dtrace probes]) + DTRACE_LIBS="" + if test x"$this_os" = x"freebsd" ; then + DTRACE_LIBS="-lelf" + fi + AC_SUBST(DTRACE_LIBS) + fi + AM_CONDITIONAL(WITH_DTRACE, test "x$WDTRACE" = "xyes") +]) + +dnl Check for dbus-glib, for AFP stats +AC_DEFUN([AC_NETATALK_DBUS_GLIB], [ + 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_CFLAGS) + AC_SUBST(DBUS_LIBS) + AC_SUBST(DBUS_GLIB_CFLAGS) + 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) + + AC_ARG_WITH( + dbus-sysconf-dir, + [AS_HELP_STRING([--with-dbus-sysconf-dir],[Path to dbus system bus security configuration directory (default: ${sysconfdir}/dbus-1/system.d/)])], + ac_cv_dbus_sysdir=$withval, + ac_cv_dbus_sysdir='${sysconfdir}/dbus-1/system.d' + ) + + if test x$have_dbus_glib = xyes -a x$have_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) + fi +]) + dnl Whether to enable developer build AC_DEFUN([AC_DEVELOPER], [ AC_MSG_CHECKING([whether to enable developer build]) @@ -15,38 +75,33 @@ AC_DEFUN([AC_DEVELOPER], [ 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]) - 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]) + 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" = x"no" ; then + 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 library is available]) + 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_SUBST(TRACKER_CFLAGS) - AC_SUBST(TRACKER_LIBS) - AM_CONDITIONAL(HAVE_TRACKER, [test x"$ac_cv_have_tracker" = x"yes"]) - 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]) - AC_MSG_NOTICE([searching for $ac_cv_tracker_miner_pkg]) - 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 @@ -54,6 +109,25 @@ AC_DEFUN([AC_NETATALK_SPOTLIGHT], [ 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 @@ -103,13 +177,47 @@ AC_ARG_ENABLE(fhs, use_pam_so=yes AC_DEFINE(FHS_COMPATIBILITY, 1, [Define if you want compatibily with the FHS]) AC_MSG_RESULT([yes]) + atalk_cv_fhs_compat=yes else AC_MSG_RESULT([no]) + atalk_cv_fhs_compat=no fi ],[ AC_MSG_RESULT([no]) - ] -)]) + atalk_cv_fhs_compat=no +])]) + +dnl netatalk lockfile path +AC_DEFUN([AC_NETATALK_LOCKFILE], [ + AC_MSG_CHECKING([netatalk lockfile path]) + AC_ARG_WITH( + lockfile, + [AS_HELP_STRING([--with-lockfile=PATH],[Path of netatalk lockfile])], + ac_cv_netatalk_lock=$withval, + ac_cv_netatalk_lock="" + ) + if test -z "$ac_cv_netatalk_lock" ; then + ac_cv_netatalk_lock=/var/spool/locks/netatalk + if test x"$atalk_cv_fhs_compat" = x"yes" ; then + ac_cv_netatalk_lock=/var/run/netatalk.pid + else + case "$host_os" in + *freebsd*) + ac_cv_netatalk_lock=/var/spool/lock/netatalk + ;; + *netbsd*|*openbsd*) + ac_cv_netatalk_lock=/var/run/netatalk.pid + ;; + *linux*) + ac_cv_netatalk_lock=/var/lock/netatalk + ;; + esac + fi + fi + AC_DEFINE_UNQUOTED(PATH_NETATALK_LOCK, ["$ac_cv_netatalk_lock"], [netatalk lockfile path]) + AC_SUBST(PATH_NETATALK_LOCK, ["$ac_cv_netatalk_lock"]) + AC_MSG_RESULT([$ac_cv_netatalk_lock]) +]) dnl 64bit platform check AC_DEFUN([AC_NETATALK_64BIT_LIBS], [ @@ -402,7 +510,7 @@ fi dnl ----- Linux specific ----- if test x"$this_os" = "xlinux"; then AC_MSG_RESULT([ * Linux specific configuration]) - + AC_DEFINE(LINUX, 1, [OS is Linux]) dnl ----- check if we need the quotactl wrapper AC_CHECK_HEADERS(linux/dqblk_xfs.h,, [AC_CHECK_HEADERS(linux/xqm.h linux/xfs_fs.h) @@ -628,7 +736,7 @@ save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" CFLAGS="$KRB5_CFLAGS" LIBS="$KRB5_LIBS" -AC_CHECK_FUNCS([krb5_free_unparsed_name krb5_free_error_message]) +AC_CHECK_FUNCS([krb5_free_unparsed_name krb5_free_error_message krb5_free_keytab_entry_contents krb5_kt_free_entry]) CFLAGS="$save_CFLAGS" LIBS="$save_LIBS" ])