X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fnetatalk.m4;h=e54627ae8de81dab88871f3225a04321e60d7800;hb=9b7cefe27a98b3166d5f9bd4faa0cf7cfafef10c;hp=32ccd9e67c74fe1d6c8e0e1ea7dad6818d9d0867;hpb=b3c52ea7097b09cafe6002acca2c996f1f5ea2fb;p=netatalk.git
diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 32ccd9e6..e54627ae 100644
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -1,21 +1,242 @@
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,
+ 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], [
+ 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)
+ 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
+ CFLAGS="$CFLAGS $DBUS_GLIB_CFLAGS"
+ LIBS="$LIBS $DBUS_GLIB_LIBS"
+ AC_CHECK_FUNC([dbus_g_bus_get_private], [atalk_cv_with_dbus=yes], [atalk_cv_with_dbus=no])
+ CFLAGS="$saved_CFLAGS"
+ LIBS="$saved_LIBS"
+ fi
+ fi
+
+ 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
+
+ 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
+AC_DEFUN([AC_DEVELOPER], [
+ AC_MSG_CHECKING([whether to enable developer build])
+ AC_ARG_ENABLE(
+ developer,
+ AS_HELP_STRING([--enable-developer], [whether to enable developer build (ABI checking)]),
+ enable_dev=$enableval,
+ enable_dev=no
+ )
+ 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_have_tracker=no
+ ac_cv_tracker_pkg_version_default=0.12
+ ac_cv_tracker_pkg_version_min=0.12
+
+ 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)])],
+ [ac_cv_tracker_pkg_version=$withval],
+ [ac_cv_tracker_pkg_version=$ac_cv_tracker_pkg_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`"]
+ )
+
+ 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"$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_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"])
+])
+
dnl Whether to disable bundled libevent
AC_DEFUN([AC_NETATALK_LIBEVENT], [
- AC_MSG_CHECKING([whether to disable bundled libevent (define CPPFLAGS and LDFLAGS otherwise appropiately to pick up installed version)])
- AC_ARG_ENABLE(
- bundled-libevent,
- [AC_HELP_STRING(
- [--disable-bundled-libevent],
- [whether the bundled version of libevent shall not be used (define CPPFLAGS and LDFLAGS otherwise appropiately to pick up installed version)]
- )],
- use_bundled_libevent=$enableval,
+ AC_MSG_CHECKING([whether to use bundled libevent])
+ AC_ARG_WITH(
+ libevent,
+ [AS_HELP_STRING([--with-libevent],[whether to use the bundled libevent (default: yes)])],
+ use_bundled_libevent=$withval,
use_bundled_libevent=yes
)
-
+ AC_ARG_WITH(
+ libevent-header,
+ [AS_HELP_STRING([--with-libevent-header],[path to libevent header files])],
+ [use_bundled_libevent=no; LIBEVENT_CFLAGS=-I$withval]
+ )
+ AC_ARG_WITH(
+ libevent-lib,
+ [AS_HELP_STRING([--with-libevent-lib],[path to libevent library])],
+ [use_bundled_libevent=no; LIBEVENT_LDFLAGS=-L$withval]
+ )
+ if test x"$LIBEVENT_CFLAGS" = x"-Iyes" -o x"$LIBEVENT_LDFLAGS" = x"-Lyes" ; then
+ AC_MSG_ERROR([--with-libevent requires a path])
+ fi
+ AC_MSG_RESULT([$use_bundled_libevent])
if test x"$use_bundled_libevent" = x"yes" ; then
AC_CONFIG_SUBDIRS([libevent])
fi
+ AC_SUBST(LIBEVENT_CFLAGS)
+ AC_SUBST(LIBEVENT_LDFLAGS)
AM_CONDITIONAL(USE_BUILTIN_LIBEVENT, test x"$use_bundled_libevent" = x"yes")
])
@@ -25,21 +246,59 @@ AC_MSG_CHECKING([whether to use Filesystem Hierarchy Standard (FHS) compatibilit
AC_ARG_ENABLE(fhs,
[ --enable-fhs use Filesystem Hierarchy Standard (FHS) compatibility],[
if test "$enableval" = "yes"; then
- uams_path="${libdir}/netatalk"
+ bindir="/bin"
+ sbindir="/sbin"
sysconfdir="/etc"
- PKGCONFDIR=${sysconfdir}/netatalk
- SERVERTEXT="${PKGCONFDIR}/msg"
- use_pam_so=yes
+ libdir="/lib"
+ localstatedir="/var"
mandir="/usr/share/man"
+ uams_path="${libdir}/netatalk"
+ PKGCONFDIR="${sysconfdir}"
+ SERVERTEXT="${localstatedir}/netatalk/msg"
+ 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], [
@@ -103,7 +362,7 @@ dnl Check for optional cracklib support
AC_DEFUN([AC_NETATALK_CRACKLIB], [
netatalk_cv_with_cracklib=no
AC_ARG_WITH(cracklib,
- [ --with-cracklib=DICT enable/set location of cracklib dictionary],[
+ [ --with-cracklib[[=DICT]] enable/set location of cracklib dictionary [[no]]],[
if test "x$withval" != "xno" ; then
cracklib="$withval"
AC_CHECK_LIB(crack, main, [
@@ -222,10 +481,10 @@ AC_ARG_ENABLE(shell-check,
)
])
-dnl Check for optional sysv initscript install
+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|systemd]]],
+ [ --with-init-style use OS specific init config [[redhat-sysv|redhat-systemd|suse-sysv|suse-systemd|gentoo|netbsd|debian|solaris|systemd]]],
init_style="$withval", init_style=none
)
case "$init_style" in
@@ -233,47 +492,67 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [
AC_MSG_ERROR([--with-init-style=redhat is obsoleted. Use redhat-sysv or redhat-systemd.])
;;
"redhat-sysv")
- AC_MSG_RESULT([enabling redhat-style sysv (upstart) configuration])
+ AC_MSG_RESULT([enabling redhat-style sysv initscript support])
+ ac_cv_init_dir="/etc/rc.d/init.d"
;;
"redhat-systemd")
AC_MSG_RESULT([enabling redhat-style systemd support])
+ ac_cv_init_dir="/lib/systemd/system"
;;
"suse")
AC_MSG_ERROR([--with-init-style=suse is obsoleted. Use suse-sysv or suse-systemd.])
;;
"suse-sysv")
- AC_MSG_RESULT([enabling suse-style sysv configuration])
+ AC_MSG_RESULT([enabling suse-style sysv initscript support])
+ ac_cv_init_dir="/etc/init.d"
;;
"suse-systemd")
AC_MSG_RESULT([enabling suse-style systemd support (>=openSUSE12.1)])
+ ac_cv_init_dir="/lib/systemd/system"
;;
"gentoo")
- AC_MSG_RESULT([enabling gentoo-style sysv support])
+ AC_MSG_RESULT([enabling gentoo-style initscript support])
+ ac_cv_init_dir="/etc/init.d"
;;
"netbsd")
- AC_MSG_RESULT([enabling netbsd-style sysv support])
+ AC_MSG_RESULT([enabling netbsd-style initscript support])
+ ac_cv_init_dir="/etc/rc.d"
;;
"debian")
- AC_MSG_RESULT([enabling debian-style sysv support])
+ AC_MSG_RESULT([enabling debian-style initscript support])
+ ac_cv_init_dir="/etc/init.d"
+ ;;
+ "solaris")
+ AC_MSG_RESULT([enabling solaris-style SMF support])
+ ac_cv_init_dir="/lib/svc/manifest/network/"
;;
"systemd")
- AC_MSG_RESULT([use general systemd configuration])
+ AC_MSG_RESULT([enabling general systemd support])
+ ac_cv_init_dir="/lib/systemd/system"
+ ;;
+ "none")
+ AC_MSG_RESULT([disabling init-style support])
+ ac_cv_init_dir="none"
;;
*)
- AC_MSG_RESULT([disabling sysv support])
+ AC_MSG_ERROR([illegal init-style])
;;
esac
AM_CONDITIONAL(USE_NETBSD, test x$init_style = xnetbsd)
AM_CONDITIONAL(USE_REDHAT_SYSV, test x$init_style = xredhat-sysv)
AM_CONDITIONAL(USE_SUSE_SYSV, test x$init_style = xsuse-sysv)
- AM_CONDITIONAL(USE_SHADOWPW, test x$shadowpw = xyes)
- AM_CONDITIONAL(USE_TRU64, test x$init_style = xtru64)
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_SYSTEMD, test x$init_style = xsystemd || test x$init_style = xredhat-systemd || test x$init_style = xsuse-systemd)
AM_CONDITIONAL(USE_UNDEF, test x$init_style = xnone)
+ AC_ARG_WITH(init-dir,
+ [ --with-init-dir=PATH path to OS specific init directory],
+ ac_cv_init_dir="$withval", ac_cv_init_dir="$ac_cv_init_dir"
+ )
+ INIT_DIR="$ac_cv_init_dir"
+ AC_SUBST(INIT_DIR, ["$ac_cv_init_dir"])
])
dnl OS specific configuration
@@ -328,7 +607,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)
@@ -443,13 +722,11 @@ if test x"$this_os" = "xsolaris"; then
fi
AC_CACHE_CHECK([for timeout_id_t],netatalk_cv_HAVE_TIMEOUT_ID_T,[
- AC_TRY_LINK([\
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[\
#include
-#include ],
-[\
+#include ]], [[\
timeout_id_t dummy;
-],
-netatalk_cv_HAVE_TIMEOUT_ID_T=yes,netatalk_cv_HAVE_TIMEOUT_ID_T=no,netatalk_cv_HAVE_TIMEOUT_ID_T=cross)])
+]])],[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
@@ -550,6 +827,15 @@ fi
if test x"$with_kerberos" = x"yes"; then
AC_DEFINE([HAVE_KERBEROS], [1], [Define if Kerberos 5 is available])
fi
+
+dnl Check for krb5_free_unparsed_name and krb5_free_error_message
+save_CFLAGS="$CFLAGS"
+save_LIBS="$LIBS"
+CFLAGS="$KRB5_CFLAGS"
+LIBS="$KRB5_LIBS"
+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"
])
dnl Check for overwrite the config files or not
@@ -575,15 +861,20 @@ AC_ARG_WITH(ldap,
)
AC_MSG_RESULT($netatalk_cv_ldap)
-save_CFLAGS=$CFLAGS
-save_LDLFLAGS=$LDLFLAGS
+save_CFLAGS="$CFLAGS"
+save_LDFLAGS="$LDFLAGS"
+save_LIBS="$LIBS"
CFLAGS=""
-LDLFLAGS=""
+LDFLAGS=""
+LIBS=""
+LDAP_CFLAGS=""
+LDAP_LDFLAGS=""
+LDAP_LIBS=""
if test x"$netatalk_cv_ldap" != x"no" ; then
if test x"$netatalk_cv_ldap" != x"yes" -a x"$netatalk_cv_ldap" != x"auto"; then
- CFLAGS=-I$netatalk_cv_ldap/include
- LDLFLAGS=-L$netatalk_cv_ldap/lib
+ CFLAGS="-I$netatalk_cv_ldap/include"
+ LDFLAGS="-L$netatalk_cv_ldap/lib"
fi
AC_CHECK_HEADER([ldap.h], netatalk_cv_ldap=yes,
[ if test x"$netatalk_cv_ldap" = x"yes" ; then
@@ -600,17 +891,18 @@ if test x"$netatalk_cv_ldap" != x"no" ; then
fi
if test x"$netatalk_cv_ldap" = x"yes"; then
- LDAP_CFLAGS=$CFLAGS
- LDAP_LDLFLAGS=$LDLFLAGS
- LDAP_LIBS=-lldap
+ LDAP_CFLAGS="$CFLAGS"
+ LDAP_LDFLAGS="$LDFLAGS"
+ LDAP_LIBS="-lldap"
AC_DEFINE(HAVE_LDAP,1,[Whether LDAP is available])
- AC_SUBST(LDAP_CFLAGS)
- AC_SUBST(LDAP_LDLFLAGS)
- AC_SUBST(LDAP_LIBS)
fi
-CFLAGS=$save_CFLAGS
-LDLFLAGS=$save_LDLFLAGS
+AC_SUBST(LDAP_CFLAGS)
+AC_SUBST(LDAP_LDFLAGS)
+AC_SUBST(LDAP_LIBS)
+CFLAGS="$save_CFLAGS"
+LDFLAGS="$save_LDFLAGS"
+LIBS="$save_LIBS"
])
dnl Check for ACL support
@@ -680,17 +972,15 @@ if test x"$with_acl_support" = x"yes" ; then
AC_CACHE_CHECK([for POSIX ACL support],netatalk_cv_HAVE_POSIX_ACLS,[
acl_LIBS=$LIBS
LIBS="$LIBS $ACL_LIBS"
- AC_TRY_LINK([
+ 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
+ ]])],[netatalk_cv_HAVE_POSIX_ACLS=yes],[netatalk_cv_HAVE_POSIX_ACLS=no
with_acl_support=no])
LIBS=$acl_LIBS
])
@@ -700,16 +990,14 @@ if test x"$with_acl_support" = x"yes" ; then
AC_CACHE_CHECK([for acl_get_perm_np],netatalk_cv_HAVE_ACL_GET_PERM_NP,[
acl_LIBS=$LIBS
LIBS="$LIBS $ACL_LIBS"
- AC_TRY_LINK([
+ 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])
+ ]])],[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
@@ -822,18 +1110,16 @@ if test x"$ac_cv_func_getxattr" = x"yes" ; then
AC_CACHE_CHECK([whether xattr interface takes additional options], smb_attr_cv_xattr_add_opt, [
old_LIBS=$LIBS
LIBS="$LIBS $ACL_LIBS"
- AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include
#if HAVE_ATTR_XATTR_H
#include
#elif HAVE_SYS_XATTR_H
#include
#endif
- ],[
+ ]], [[
getxattr(0, 0, 0, 0, 0, 0);
- ],
- [smb_attr_cv_xattr_add_opt=yes],
- [smb_attr_cv_xattr_add_opt=no;LIBS=$old_LIBS])
+ ]])],[smb_attr_cv_xattr_add_opt=yes],[smb_attr_cv_xattr_add_opt=no;LIBS=$old_LIBS])
])
if test x"$smb_attr_cv_xattr_add_opt" = x"yes"; then
AC_DEFINE(XATTR_ADD_OPT, 1, [xattr functions have additional options])
@@ -922,6 +1208,7 @@ if test x"$netatalk_cv_search_sendfile" = x"yes"; then
AC_DEFINE(SENDFILE_FLAVOR_SOLARIS, 1, [Solaris sendfile()])
AC_SEARCH_LIBS(sendfile, sendfile)
AC_CHECK_FUNC([sendfile], [netatalk_cv_HAVE_SENDFILE=yes])
+ AC_CHECK_FUNCS([sendfilev])
;;
*freebsd*)
@@ -944,7 +1231,7 @@ dnl --------------------- Check if realpath() takes NULL
AC_DEFUN([AC_NETATALK_REALPATH], [
AC_CACHE_CHECK([if the realpath function allows a NULL argument],
neta_cv_REALPATH_TAKES_NULL, [
- AC_TRY_RUN([
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include
#include
#include
@@ -958,15 +1245,12 @@ AC_CACHE_CHECK([if the realpath function allows a NULL argument],
signal(SIGSEGV, exit_on_core);
newpath = realpath("/tmp", NULL);
exit((newpath != NULL) ? 0 : 1);
- }],
- neta_cv_REALPATH_TAKES_NULL=yes,
- neta_cv_REALPATH_TAKES_NULL=no,
- neta_cv_REALPATH_TAKES_NULL=cross
- )
+ }]])],[neta_cv_REALPATH_TAKES_NULL=yes],[neta_cv_REALPATH_TAKES_NULL=no],[neta_cv_REALPATH_TAKES_NULL=cross
+ ])
]
)
if test x"$neta_cv_REALPATH_TAKES_NULL" = x"yes"; then
AC_DEFINE(REALPATH_TAKES_NULL,1,[Whether the realpath function allows NULL])
fi
-])
\ No newline at end of file
+])