X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fnetatalk.m4;h=12a1fecbc3660ad684e2f94f9a34f5edde8ef299;hb=259af075df56ba4ad3a0eed91c81fb4df4111f54;hp=e2ca4d020a1e6ed367180ead56231d81a164287f;hpb=2c353f712bc4077ef94be0a82ae61bd93fce2423;p=netatalk.git diff --git a/macros/netatalk.m4 b/macros/netatalk.m4 index e2ca4d02..12a1fecb 100644 --- a/macros/netatalk.m4 +++ b/macros/netatalk.m4 @@ -148,7 +148,7 @@ AC_DEFUN([AC_NETATALK_SPOTLIGHT], [ dnl Tracker SPARQL AC_ARG_WITH([tracker-pkgconfig-version], - [AS_HELP_STRING([--with-tracker-pkgconfig-version=VERSION],[Version suffix of the Tracker SPARQL and tracker-miner pkg in pkg-config (default: 0.12)])], + [AS_HELP_STRING([--with-tracker-pkgconfig-version=VERSION],[Version suffix of the Tracker SPARQL pkg-config (default: 0.12)])], [ac_cv_tracker_pkg_version=$withval], [ac_cv_tracker_pkg_version=$ac_cv_tracker_pkg_version_default] ) @@ -161,52 +161,23 @@ AC_DEFUN([AC_NETATALK_SPOTLIGHT], [ AC_ARG_VAR([PKG_CONFIG_PATH], [Path to additional pkg-config packages]) PKG_CHECK_MODULES([TRACKER], [tracker-sparql-$ac_cv_tracker_pkg_version >= $ac_cv_tracker_pkg_version_min], [ac_cv_have_tracker_sparql=yes], [ac_cv_have_tracker_sparql=no]) - PKG_CHECK_MODULES([TRACKER_MINER], [tracker-miner-$ac_cv_tracker_pkg_version >= $ac_cv_tracker_pkg_version_min], [ac_cv_have_tracker_miner=yes], [ac_cv_have_tracker_miner=no]) - if test x"$ac_cv_have_tracker_sparql" = x"no" -o x"$ac_cv_have_tracker_miner" = x"no" ; then + if test x"$ac_cv_have_tracker_sparql" = x"no" ; then if test x"$need_tracker_sparql" = x"yes" ; then AC_MSG_ERROR([$ac_cv_tracker_pkg not found]) fi else + ac_cv_have_tracker=yes AC_DEFINE(HAVE_TRACKER, 1, [Define if Tracker is available]) - AC_DEFINE(HAVE_TRACKER_SPARQL, 1, [Define if Tracker SPARQL is available]) - AC_DEFINE(HAVE_TRACKER_MINER, 1, [Define if Tracker miner library is available]) AC_DEFINE_UNQUOTED(TRACKER_PREFIX, ["$ac_cv_tracker_prefix"], [Path to Tracker]) AC_DEFINE([DBUS_DAEMON_PATH], ["/bin/dbus-daemon"], [Path to dbus-daemon]) - ac_cv_tracker_type="(SPARQL)" fi - dnl Test for Tracker 0.6 on Solaris and derived platforms, and FreeBSD - if test x"$ac_cv_have_tracker_sparql" != x"yes" ; then - if test x"$this_os" = x"solaris" -o x"$this_os" = x"freebsd" ; 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_type="(RDF)" - case "$this_os" in - *solaris*) - AC_DEFINE([DBUS_DAEMON_PATH], ["/usr/lib/dbus-daemon"], [Path to dbus-daemon]) - AC_DEFINE([TRACKERD_PATH], ["/bin/trackerd"], [Path to trackerd]) - ;; - *freebsd*) - AC_DEFINE([DBUS_DAEMON_PATH], ["/usr/local/bin/dbus-daemon"], [Path to dbus-daemon]) - AC_DEFINE([TRACKERD_PATH], ["/usr/local/libexec/trackerd"], [Path to trackerd]) - ;; - esac - fi - 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) AC_SUBST(TRACKER_MINER_CFLAGS) AC_SUBST(TRACKER_MINER_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"]) + AM_CONDITIONAL(HAVE_TRACKER, [test x"$ac_cv_have_tracker" = x"yes"]) ]) dnl Whether to disable bundled libevent @@ -240,6 +211,31 @@ AC_DEFUN([AC_NETATALK_LIBEVENT], [ AM_CONDITIONAL(USE_BUILTIN_LIBEVENT, test x"$use_bundled_libevent" = x"yes") ]) +dnl Whether to disable bundled tdb +AC_DEFUN([AC_NETATALK_TDB], [ + AC_ARG_WITH( + tdb, + [AS_HELP_STRING([--with-tdb],[whether to use the bundled tdb (default: yes)])], + use_bundled_tdb=$withval, + use_bundled_tdb=yes + ) + AC_MSG_CHECKING([whether to use bundled tdb]) + AC_MSG_RESULT([$use_bundled_tdb]) + + if test x"$use_bundled_tdb" = x"yes" ; then + AC_DEFINE(USE_BUILTIN_TDB, 1, [Use internal tbd]) + else + if test -z "$TDB_LIBS" ; then + PKG_CHECK_MODULES(TDB, tdb, , [AC_MSG_ERROR([couldn't find tdb with pkg-config])]) + fi + use_bundled_tdb=no + fi + + AC_SUBST(TDB_CFLAGS) + AC_SUBST(TDB_LIBS) + AM_CONDITIONAL(USE_BUILTIN_TDB, test x"$use_bundled_tdb" = x"yes") +]) + dnl Filesystem Hierarchy Standard (FHS) compatibility AC_DEFUN([AC_NETATALK_FHS], [ AC_MSG_CHECKING([whether to use Filesystem Hierarchy Standard (FHS) compatibility]) @@ -484,7 +480,7 @@ AC_ARG_ENABLE(shell-check, dnl Check for optional initscript install AC_DEFUN([AC_NETATALK_INIT_STYLE], [ AC_ARG_WITH(init-style, - [ --with-init-style use OS specific init config [[redhat-sysv|redhat-systemd|suse-sysv|suse-systemd|gentoo|netbsd|debian|solaris|systemd]]], + [ --with-init-style use OS specific init config [[redhat-sysv|redhat-systemd|suse-sysv|suse-systemd|gentoo|netbsd|debian-sysv|debian-systemd|solaris|systemd]]], init_style="$withval", init_style=none ) case "$init_style" in @@ -497,7 +493,7 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [ ;; "redhat-systemd") AC_MSG_RESULT([enabling redhat-style systemd support]) - ac_cv_init_dir="/lib/systemd/system" + ac_cv_init_dir="/usr/lib/systemd/system" ;; "suse") AC_MSG_ERROR([--with-init-style=suse is obsoleted. Use suse-sysv or suse-systemd.]) @@ -508,7 +504,7 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [ ;; "suse-systemd") AC_MSG_RESULT([enabling suse-style systemd support (>=openSUSE12.1)]) - ac_cv_init_dir="/lib/systemd/system" + ac_cv_init_dir="/usr/lib/systemd/system" ;; "gentoo") AC_MSG_RESULT([enabling gentoo-style initscript support]) @@ -519,16 +515,23 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [ ac_cv_init_dir="/etc/rc.d" ;; "debian") - AC_MSG_RESULT([enabling debian-style initscript support]) + AC_MSG_ERROR([--with-init-style=debian is obsoleted. Use debian-sysv or debian-systemd.]) + ;; + "debian-sysv") + AC_MSG_RESULT([enabling debian-style sysv initscript support]) ac_cv_init_dir="/etc/init.d" ;; + "debian-systemd") + AC_MSG_RESULT([enabling debian-style systemd support]) + ac_cv_init_dir="/lib/systemd/system" + ;; "solaris") AC_MSG_RESULT([enabling solaris-style SMF support]) ac_cv_init_dir="/lib/svc/manifest/network/" ;; "systemd") AC_MSG_RESULT([enabling general systemd support]) - ac_cv_init_dir="/lib/systemd/system" + ac_cv_init_dir="/usr/lib/systemd/system" ;; "none") AC_MSG_RESULT([disabling init-style support]) @@ -543,8 +546,9 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [ AM_CONDITIONAL(USE_SUSE_SYSV, test x$init_style = xsuse-sysv) AM_CONDITIONAL(USE_SOLARIS, test x$init_style = xsolaris) AM_CONDITIONAL(USE_GENTOO, test x$init_style = xgentoo) - AM_CONDITIONAL(USE_DEBIAN, test x$init_style = xdebian) + AM_CONDITIONAL(USE_DEBIAN_SYSV, test x$init_style = xdebian-sysv) AM_CONDITIONAL(USE_SYSTEMD, test x$init_style = xsystemd || test x$init_style = xredhat-systemd || test x$init_style = xsuse-systemd) + AM_CONDITIONAL(USE_DEBIAN_SYSTEMD, test x$init_style = xdebian-systemd) AM_CONDITIONAL(USE_UNDEF, test x$init_style = xnone) AC_ARG_WITH(init-dir, @@ -775,7 +779,7 @@ dnl Check for LDAP support, for client-side ACL visibility AC_DEFUN([AC_NETATALK_LDAP], [ AC_MSG_CHECKING(for LDAP (necessary for client-side ACL visibility)) AC_ARG_WITH(ldap, - [AS_HELP_STRING([--with-ldap], + [AS_HELP_STRING([--with-ldap[[=PATH]]], [LDAP support (default=auto)])], netatalk_cv_ldap=$withval, netatalk_cv_ldap=auto @@ -828,6 +832,7 @@ LIBS="$save_LIBS" dnl Check for ACL support AC_DEFUN([AC_NETATALK_ACL], [ +ac_cv_have_acls=no AC_MSG_CHECKING(whether to support ACLs) AC_ARG_WITH(acls, [AS_HELP_STRING([--with-acls], @@ -845,112 +850,125 @@ AC_MSG_RESULT($with_acl_support) if test x"$with_acl_support" = x"no"; then AC_MSG_RESULT(Disabling ACL support) - AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support should be built in]) -else - with_acl_support=yes fi -if test x"$with_acl_support" = x"yes" ; then - AC_MSG_NOTICE(checking whether ACL support is available:) +# Platform specific checks +if test x"$with_acl_support" != x"no" ; then case "$host_os" in - *sysv5*) - AC_MSG_NOTICE(Using UnixWare ACLs) - AC_DEFINE(HAVE_UNIXWARE_ACLS,1,[Whether UnixWare ACLs are available]) - ;; *solaris*) AC_MSG_NOTICE(Using solaris ACLs) - AC_DEFINE(HAVE_SOLARIS_ACLS,1,[Whether solaris ACLs are available]) + AC_DEFINE(HAVE_SOLARIS_ACLS,1,[Whether Solaris ACLs are available]) + AC_DEFINE(HAVE_NFSV4_ACLS,1,[Whether NFSv4 ACLs are available]) ACL_LIBS="$ACL_LIBS -lsec" + ac_cv_have_acls=yes ;; - *hpux*) - AC_MSG_NOTICE(Using HPUX ACLs) - AC_DEFINE(HAVE_HPUX_ACLS,1,[Whether HPUX ACLs are available]) - ;; - *irix*) - AC_MSG_NOTICE(Using IRIX ACLs) - AC_DEFINE(HAVE_IRIX_ACLS,1,[Whether IRIX ACLs are available]) - ;; - *aix*) - AC_MSG_NOTICE(Using AIX ACLs) - AC_DEFINE(HAVE_AIX_ACLS,1,[Whether AIX ACLs are available]) - ;; - *osf*) - AC_MSG_NOTICE(Using Tru64 ACLs) - AC_DEFINE(HAVE_TRU64_ACLS,1,[Whether Tru64 ACLs are available]) - ACL_LIBS="$ACL_LIBS -lpacl" + *freebsd*) + AC_MSG_NOTICE(checking whether libsunacl is available) + sunacl_include_path="/usr/local/include" + sunacl_lib_path="/usr/local/lib" + + save_CPPFLAGS=$CPPFLAGS + save_LDFLAGS=$LDFLAGS + save_LIBS=$LIBS + + CPPFLAGS="-I$sunacl_include_path $CPPFLAGS" + AC_CHECK_HEADER([sunacl.h]) + + LDFLAGS="-L$sunacl_lib_path $LDFLAGS" + AC_CHECK_LIB([sunacl], [acl]) + + if test x"$ac_cv_header_sunacl_h" = x"yes" -a x"$ac_cv_lib_sunacl_acl" = x"yes" ; then + AC_MSG_NOTICE([Enabling support for ZFS ACLs using libsunacl]) + ac_cv_have_acls=yes + CFLAGS="-I$sunacl_include_path $CFLAGS" + ACL_LIBS="$ACL_LIBS -L$sunacl_lib_path -lsunacl" + AC_DEFINE(HAVE_FREEBSD_SUNACL, 1, [Whether FreeBSD ZFS ACLs with libsunacl are available]) + AC_DEFINE(HAVE_NFSV4_ACLS,1,[Whether NFSv4 ACLs are available]) + else + AC_MSG_NOTICE([libsunacl not found, disabling ZFS ACL support]) + fi + + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; - *darwin*) - AC_MSG_NOTICE(ACLs on Darwin currently not supported) - AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support is available]) + esac +fi + +if test x"$with_acl_support" != x"no" -a x"$ac_cv_have_acls" != x"yes" ; then + # Runtime checks for POSIX ACLs + AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"]) + case "$host_os" in + *linux*) + AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"]) ;; - *) - AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"]) - case "$host_os" in - *linux*) - AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"]) - ;; - esac - AC_CACHE_CHECK([for POSIX ACL support],netatalk_cv_HAVE_POSIX_ACLS,[ + esac + + AC_CACHE_CHECK([for POSIX ACL support],netatalk_cv_HAVE_POSIX_ACLS,[ + acl_LIBS=$LIBS + LIBS="$LIBS $ACL_LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + ]], [[ + acl_t acl; + int entry_id; + acl_entry_t *entry_p; + return acl_get_entry(acl, entry_id, entry_p); + ]])], + [netatalk_cv_HAVE_POSIX_ACLS=yes; ac_cv_have_acls=yes], + [netatalk_cv_HAVE_POSIX_ACLS=no; ac_cv_have_acls=no] + ) + LIBS=$acl_LIBS + ]) + + if test x"$netatalk_cv_HAVE_POSIX_ACLS" = x"yes"; then + AC_MSG_NOTICE(Using POSIX ACLs) + AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether POSIX ACLs are available]) + + AC_CACHE_CHECK([for acl_get_perm_np],netatalk_cv_HAVE_ACL_GET_PERM_NP,[ acl_LIBS=$LIBS LIBS="$LIBS $ACL_LIBS" AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include ]], [[ - acl_t acl; - int entry_id; - acl_entry_t *entry_p; - return acl_get_entry(acl, entry_id, entry_p); - ]])],[netatalk_cv_HAVE_POSIX_ACLS=yes],[netatalk_cv_HAVE_POSIX_ACLS=no - with_acl_support=no]) + acl_permset_t permset_d; + acl_perm_t perm; + return acl_get_perm_np(permset_d, perm); + ]])],[netatalk_cv_HAVE_ACL_GET_PERM_NP=yes],[netatalk_cv_HAVE_ACL_GET_PERM_NP=no]) LIBS=$acl_LIBS ]) - if test x"$netatalk_cv_HAVE_POSIX_ACLS" = x"yes"; then - AC_MSG_NOTICE(Using POSIX ACLs) - AC_DEFINE(HAVE_POSIX_ACLS,1,[Whether POSIX ACLs are available]) - AC_CACHE_CHECK([for acl_get_perm_np],netatalk_cv_HAVE_ACL_GET_PERM_NP,[ - acl_LIBS=$LIBS - LIBS="$LIBS $ACL_LIBS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include - #include - ]], [[ - acl_permset_t permset_d; - acl_perm_t perm; - return acl_get_perm_np(permset_d, perm); - ]])],[netatalk_cv_HAVE_ACL_GET_PERM_NP=yes],[netatalk_cv_HAVE_ACL_GET_PERM_NP=no]) - LIBS=$acl_LIBS - ]) - if test x"$netatalk_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then - AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available]) - fi - - - AC_CACHE_CHECK([for acl_from_mode], netatalk_cv_HAVE_ACL_FROM_MODE,[ - acl_LIBS=$LIBS - LIBS="$LIBS $ACL_LIBS" - AC_CHECK_FUNCS(acl_from_mode, - [netatalk_cv_HAVE_ACL_FROM_MODE=yes], - [netatalk_cv_HAVE_ACL_FROM_MODE=no]) - LIBS=$acl_LIBS - ]) - if test x"netatalk_cv_HAVE_ACL_FROM_MODE" = x"yes"; then - AC_DEFINE(HAVE_ACL_FROM_MODE,1,[Whether acl_from_mode() is available]) - fi + if test x"$netatalk_cv_HAVE_ACL_GET_PERM_NP" = x"yes"; then + AC_DEFINE(HAVE_ACL_GET_PERM_NP,1,[Whether acl_get_perm_np() is available]) + fi - else - AC_MSG_NOTICE(ACL support is not avaliable) - AC_DEFINE(HAVE_NO_ACLS,1,[Whether no ACLs support is available]) + AC_CACHE_CHECK([for acl_from_mode], netatalk_cv_HAVE_ACL_FROM_MODE,[ + acl_LIBS=$LIBS + LIBS="$LIBS $ACL_LIBS" + AC_CHECK_FUNCS(acl_from_mode, + [netatalk_cv_HAVE_ACL_FROM_MODE=yes], + [netatalk_cv_HAVE_ACL_FROM_MODE=no] + ) + LIBS=$acl_LIBS + ]) + if test x"netatalk_cv_HAVE_ACL_FROM_MODE" = x"yes"; then + AC_DEFINE(HAVE_ACL_FROM_MODE,1,[Whether acl_from_mode() is available]) fi - ;; - esac + fi fi -if test x"$with_acl_support" = x"yes" ; then - AC_CHECK_HEADERS([acl/libacl.h]) - AC_DEFINE(HAVE_ACLS,1,[Whether ACLs support is available]) - AC_SUBST(ACL_LIBS) +if test x"$ac_cv_have_acls" = x"no" ; then + if test x"$with_acl_support" = x"yes" ; then + AC_MSG_ERROR(ACL support requested but not found) + else + AC_MSG_NOTICE(ACL support is not avaliable) + fi +else + AC_CHECK_HEADERS([acl/libacl.h]) + AC_DEFINE(HAVE_ACLS,1,[Whether ACLs support is available]) fi +AC_SUBST(ACL_LIBS) ]) dnl Check for Extended Attributes support @@ -1112,7 +1130,7 @@ dnl ------ Check for sendfile() -------- AC_DEFUN([AC_NETATALK_SENDFILE], [ netatalk_cv_search_sendfile=yes AC_ARG_ENABLE(sendfile, - [ --disable-sendfile disable sendfile syscall], + [ --disable-sendfile disable sendfile syscall], [if test x"$enableval" = x"no"; then netatalk_cv_search_sendfile=no fi] @@ -1148,6 +1166,23 @@ if test x"$netatalk_cv_search_sendfile" = x"yes"; then fi ]) +dnl ------ Check for recvfile() -------- +AC_DEFUN([AC_NETATALK_RECVFILE], [ +case "$host_os" in +*linux*) + AC_CHECK_FUNCS([splice], [atalk_cv_use_recvfile=yes]) + ;; + +*) + ;; + +esac + +if test x"$atalk_cv_use_recvfile" = x"yes"; then + AC_DEFINE(WITH_RECVFILE, 1, [Whether recvfile should be used]) +fi +]) + dnl --------------------- Check if realpath() takes NULL AC_DEFUN([AC_NETATALK_REALPATH], [ AC_CACHE_CHECK([if the realpath function allows a NULL argument],