X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=macros%2Fnetatalk.m4;h=060e467964a65f15d8ecb0402fd49f8917469eb7;hp=835f75fc7a84008ab9b604bbfe82a04f263e66e6;hb=42a0a094b72577aee3fee7f186da52dc83db001d;hpb=6a530a4b203eddcbe2dba44a11fa3e3150707b11 diff --git a/macros/netatalk.m4 b/macros/netatalk.m4 index 835f75fc..060e4679 100644 --- a/macros/netatalk.m4 +++ b/macros/netatalk.m4 @@ -1,5 +1,47 @@ dnl Kitchen sink for configuration macros +dnl Check for docbook +AC_DEFUN(AX_CHECK_DOCBOOK, [ + # It's just rude to go over the net to build + XSLTPROC_FLAGS=--nonet + DOCBOOK_ROOT= + XSLTPROC_WORKS=no + + AC_ARG_WITH(docbook, + AS_HELP_STRING( + [--with-docbook], + [Path to Docbook XSL directory] + ), + [DOCBOOK_ROOT=$withval] + ) + + if test -n "$DOCBOOK_ROOT" ; then + AC_CHECK_PROG(XSLTPROC,xsltproc,xsltproc,) + if test -n "$XSLTPROC"; then + AC_MSG_CHECKING([whether xsltproc works]) + DB_FILE="$DOCBOOK_ROOT/html/docbook.xsl" + $XSLTPROC $XSLTPROC_FLAGS $DB_FILE >/dev/null 2>&1 << END + + + + +END + if test "$?" = 0; then + XSLTPROC_WORKS=yes + fi + AC_MSG_RESULT($XSLTPROC_WORKS) + fi + fi + + AC_MSG_CHECKING([whether to build Docbook documentation]) + AC_MSG_RESULT($XSLTPROC_WORKS) + + AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC_WORKS" = x"yes") + AC_SUBST(XSLTPROC_FLAGS) + AC_SUBST(DOCBOOK_ROOT) + AC_SUBST(XSLTPROC) +]) + dnl Check for dtrace AC_DEFUN([AC_NETATALK_DTRACE], [ AC_ARG_WITH(dtrace, @@ -35,16 +77,19 @@ AC_DEFUN([AC_NETATALK_DTRACE], [ dnl Check for dbus-glib, for AFP stats AC_DEFUN([AC_NETATALK_DBUS_GLIB], [ - atalk_cv_with_dbus=no + atalk_cv_with_dbus=no + + AC_ARG_WITH(afpstats, + AS_HELP_STRING( + [--with-afpstats], + [Enable AFP statistics via dbus (default: enabled if dbus found)] + ),,[withval=auto] + ) + + if test x"$withval" != x"no" ; then PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1, have_dbus=yes, have_dbus=no) PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1, 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) if test x$have_dbus_glib = xyes -a x$have_dbus = xyes -a x$have_dbus_gthread = xyes ; then saved_CFLAGS=$CFLAGS saved_LIBS=$LIBS @@ -54,20 +99,32 @@ AC_DEFUN([AC_NETATALK_DBUS_GLIB], [ CFLAGS="$saved_CFLAGS" LIBS="$saved_LIBS" fi - AM_CONDITIONAL(HAVE_DBUS_GLIB, test x$atalk_cv_with_dbus = xyes) + fi - AC_ARG_WITH( - dbus-sysconf-dir, - [AS_HELP_STRING([--with-dbus-sysconf-dir=PATH],[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"$withval" = x"yes" -a x"$atalk_cv_with_dbus" = x"no"; then + AC_MSG_ERROR([afpstats requested but dbus-glib not found]) + fi - 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) - fi + AC_ARG_WITH( + dbus-sysconf-dir, + [AS_HELP_STRING([--with-dbus-sysconf-dir=PATH],[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' + ) + DBUS_SYS_DIR="" + 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" + fi + + AC_SUBST(DBUS_SYS_DIR) + 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$atalk_cv_with_dbus = xyes) ]) dnl Whether to enable developer build @@ -86,67 +143,47 @@ AC_DEFUN([AC_DEVELOPER], [ dnl Tracker, for Spotlight AC_DEFUN([AC_NETATALK_SPOTLIGHT], [ ac_cv_have_tracker=no + ac_cv_tracker_pkg_version_default=0.12 + ac_cv_tracker_pkg_version_min=0.12 + 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_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)])], + [ac_cv_tracker_pkg_version=$withval], + [ac_cv_tracker_pkg_version=$ac_cv_tracker_pkg_version_default] + ) + + AC_ARG_WITH([tracker-prefix], + [AS_HELP_STRING([--with-tracker-prefix=PATH],[Prefix of Tracker installation (default: none)])], + [ac_cv_tracker_prefix=$withval], + [ac_cv_tracker_prefix="`pkg-config --variable=prefix tracker-sparql-$ac_cv_tracker_pkg_version`"] + ) - PKG_CHECK_MODULES([TRACKER], [$ac_cv_tracker_pkg >= 0.12], [ac_cv_have_tracker_sparql=yes], [ac_cv_have_tracker_sparql=no]) + 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" ; then - if test x"$need_tracker" = x"yes" ; then + if test x"$ac_cv_have_tracker_sparql" = x"no" -o x"$ac_cv_have_tracker_miner" = x"no" ; then + if test x"$need_tracker_sparql" = 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(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]) - 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, and FreeBSD - 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]) - 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 - if test x"$ac_cv_have_tracker_sparql" = x"yes" -o x"$ac_cv_have_tracker_rdf" = x"yes" ; then + if test x"$ac_cv_have_tracker_sparql" = 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"]) ]) dnl Whether to disable bundled libevent @@ -180,6 +217,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]) @@ -437,7 +499,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.]) @@ -448,7 +510,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]) @@ -468,7 +530,7 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [ ;; "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]) @@ -594,87 +656,8 @@ if test x"$this_os" = "xsolaris"; then AC_DEFINE(SOLARIS, 1, [Solaris compatibility macro]) AC_DEFINE(_XOPEN_SOURCE, 600, [Solaris compilation environment]) AC_DEFINE(__EXTENSIONS__, 1, [Solaris compilation environment]) - CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS" need_dash_r=yes init_style=solaris - - solaris_module=no - AC_MSG_CHECKING([if we can build Solaris kernel module]) - if test -x /usr/ccs/bin/ld && test x"$netatalk_cv_ddp_enabled" = x"yes" ; then - solaris_module=yes - fi - AC_MSG_RESULT([$solaris_module]) - - COMPILE_64BIT_KMODULE=no - KCFLAGS="" - KLDFLAGS="" - COMPILE_KERNEL_GCC=no - - if test "$solaris_module" = "yes"; then - dnl Solaris kernel module stuff - AC_MSG_CHECKING([if we have to build a 64bit kernel module]) - - # check for isainfo, if not found it has to be a 32 bit kernel (<=2.6) - if test -x /usr/bin/isainfo; then - # check for 64 bit platform - if isainfo -kv | grep '^64-bit'; then - COMPILE_64BIT_KMODULE=yes - fi - fi - - AC_MSG_RESULT([$COMPILE_64BIT_KMODULE]) - - if test "${GCC}" = yes; then - COMPILE_KERNEL_GCC=yes - if test "$COMPILE_64BIT_KMODULE" = yes; then - - AC_MSG_CHECKING([if we can build a 64bit kernel module]) - - case `$CC --version 2>/dev/null` in - [[12]].* | 3.0.*) - COMPILE_64BIT_KMODULE=no - COMPILE_KERNEL_GCC=no - solaris_module=no;; - *) - # use for 64 bit - KCFLAGS="-m64" - #KLDFLAGS="-melf64_sparc" - KLDFLAGS="-64";; - esac - - AC_MSG_RESULT([$COMPILE_64BIT_KMODULE]) - - else - KCFLAGS="" - KLDFLAGS="" - fi - KCFLAGS="$KCFLAGS -D_KERNEL -Wall -Wstrict-prototypes" - else - if test "$COMPILE_64BIT_KMODULE" = yes; then - # use Sun CC (for a 64-bit kernel, uncomment " -xarch=v9 -xregs=no%appl ") - KCFLAGS="-xarch=v9 -xregs=no%appl" - KLDFLAGS="-64" - else - KCFLAGS="" - KLDFLAGS="" - fi - KCFLAGS="-D_KERNEL $KCFLAGS -mno-app-regs -munaligned-doubles -fpcc-struct-return" - fi - - AC_CACHE_CHECK([for timeout_id_t],netatalk_cv_HAVE_TIMEOUT_ID_T,[ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[\ -#include -#include ]], [[\ -timeout_id_t dummy; -]])],[netatalk_cv_HAVE_TIMEOUT_ID_T=yes],[netatalk_cv_HAVE_TIMEOUT_ID_T=no])]) - - AC_DEFINE(HAVE_TIMEOUT_ID_T, test x"$netatalk_cv_HAVE_TIMEOUT_ID" = x"yes", [define for timeout_id_t]) - fi - - AC_SUBST(COMPILE_KERNEL_GCC) - AC_SUBST(COMPILE_64BIT_KMODULE) - AC_SUBST(KCFLAGS) - AC_SUBST(KLDFLAGS) fi dnl Whether to run ldconfig after installing libraries @@ -794,7 +777,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 @@ -841,12 +824,13 @@ AC_SUBST(LDAP_CFLAGS) AC_SUBST(LDAP_LDFLAGS) AC_SUBST(LDAP_LIBS) CFLAGS="$save_CFLAGS" -LDLFLAGS="$save_LDLFLAGS" +LDFLAGS="$save_LDFLAGS" 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], @@ -864,112 +848,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 @@ -1167,6 +1164,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],