X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fnetatalk.m4;h=b5096e37677f8bc10e7bdc80e4b495d277ea7b0b;hb=42eb54de3f6373cd394fbd6abfb86d85c8dde935;hp=512e479a7aae8cd5fd3a4b7f21774a4056f4e8fe;hpb=15c1fc2f2328736dd428ec3be37c893d8ee2e065;p=netatalk.git diff --git a/macros/netatalk.m4 b/macros/netatalk.m4 index 512e479a..b5096e37 100644 --- a/macros/netatalk.m4 +++ b/macros/netatalk.m4 @@ -1,5 +1,267 @@ 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], [ + atalk_cv_with_dbus=no + 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 + atalk_cv_with_dbus=yes + fi + AM_CONDITIONAL(HAVE_DBUS_GLIB, test x$atalk_cv_with_dbus = xyes) + + 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$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 +]) + +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 + 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]) + 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]) + AC_CONFIG_SUBDIRS([libevent]) + AC_SUBST(LIBEVENT_CFLAGS) + AC_SUBST(LIBEVENT_LDFLAGS) + AM_CONDITIONAL(USE_BUILTIN_LIBEVENT, test x"$use_bundled_libevent" = x"yes") +]) + +dnl Filesystem Hierarchy Standard (FHS) compatibility +AC_DEFUN([AC_NETATALK_FHS], [ +AC_MSG_CHECKING([whether to use Filesystem Hierarchy Standard (FHS) compatibility]) +AC_ARG_ENABLE(fhs, + [ --enable-fhs use Filesystem Hierarchy Standard (FHS) compatibility],[ + if test "$enableval" = "yes"; then + bindir="/bin" + sbindir="/sbin" + sysconfdir="/etc" + 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], [ +AC_MSG_CHECKING([whether to check for 64bit libraries]) +# Test if the compiler is in 64bit mode +echo 'int i;' > conftest.$ac_ext +atalk_cv_cc_64bit_output=no +if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *"ELF 64"*) + atalk_cv_cc_64bit_output=yes + ;; + esac +fi +rm -rf conftest* + +case $host_cpu:$atalk_cv_cc_64bit_output in +powerpc64:yes | s390x:yes | sparc*:yes | x86_64:yes | i386:yes) + case $target_os in + solaris2*) + AC_MSG_RESULT([yes]) + atalk_libname="lib/64" + ;; + *bsd* | dragonfly*) + AC_MSG_RESULT([no]) + atalk_libname="lib" + ;; + *) + AC_MSG_RESULT([yes]) + atalk_libname="lib64" + ;; + esac + ;; +*:*) + AC_MSG_RESULT([no]) + atalk_libname="lib" + ;; +esac +]) + dnl Check for optional admin group support AC_DEFUN([AC_NETATALK_ADMIN_GROUP], [ netatalk_cv_admin_group=yes @@ -23,7 +285,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, [ @@ -143,37 +405,61 @@ AC_ARG_ENABLE(shell-check, ]) dnl Check for optional sysv initscript install -AC_DEFUN([AC_NETATALK_SYSV_STYLE], [ - AC_ARG_WITH(sysv-style, - [ --with-sysv-style use OS specific sysv config [[redhat-sysv|redhat-systemd|suse|gentoo|netbsd|debian]]], - sysv_style="$withval", sysv_style=none +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]]], + init_style="$withval", init_style=none ) - case "$sysv_style" in + case "$init_style" in "redhat") - AC_MSG_ERROR([--enable-redhat is obsoleted. Use --enable-redhat-sysv or --enable-redhat-systemd.]) + 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]) ;; "redhat-systemd") AC_MSG_RESULT([enabling redhat-style systemd support]) ;; "suse") - AC_MSG_RESULT([enabling suse-style sysv support]) + AC_MSG_ERROR([--with-init-style=suse is obsoleted. Use suse-sysv or suse-systemd.]) ;; + "suse-sysv") + AC_MSG_RESULT([enabling suse-style sysv initscript support]) + ;; + "suse-systemd") + AC_MSG_RESULT([enabling suse-style systemd support (>=openSUSE12.1)]) + ;; "gentoo") - AC_MSG_RESULT([enabling gentoo-style sysv support]) + AC_MSG_RESULT([enabling gentoo-style initscript support]) ;; "netbsd") - AC_MSG_RESULT([enabling netbsd-style sysv support]) + AC_MSG_RESULT([enabling netbsd-style initscript support]) ;; "debian") - AC_MSG_RESULT([enabling debian-style sysv support]) + AC_MSG_RESULT([enabling debian-style initscript support]) + ;; + "solaris") + AC_MSG_RESULT([enabling solaris-style SMF support]) + ;; + "systemd") + AC_MSG_RESULT([enabling general systemd support]) + ;; + "none") + AC_MSG_RESULT([disabling init-style support]) ;; *) - 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_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) + ]) dnl OS specific configuration @@ -228,7 +514,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) @@ -273,9 +559,11 @@ if test x"$this_os" = "xsolaris"; then AC_DEFINE(_ISOC9X_SOURCE, 1, [Compatibility macro]) AC_DEFINE(NO_STRUCT_TM_GMTOFF, 1, [Define if the gmtoff member of struct tm is not available]) 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 - sysv_style=solaris + init_style=solaris solaris_module=no AC_MSG_CHECKING([if we can build Solaris kernel module]) @@ -341,13 +629,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 @@ -358,6 +644,10 @@ netatalk_cv_HAVE_TIMEOUT_ID_T=yes,netatalk_cv_HAVE_TIMEOUT_ID_T=no,netatalk_cv_H AC_SUBST(KLDFLAGS) fi +dnl Whether to run ldconfig after installing libraries +AC_PATH_PROG(NETA_LDCONFIG, ldconfig, , [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/usr/bin]) +echo NETA_LDCONFIG = $NETA_LDCONFIG +AM_CONDITIONAL(RUN_LDCONFIG, test x"$this_os" = x"linux" -a x"$NETA_LDCONFIG" != x"") ]) dnl Check for building PGP UAM module @@ -406,6 +696,55 @@ fi AM_CONDITIONAL(USE_GSSAPI, test x"$netatalk_cv_build_krb5_uam" = x"yes") ]) +dnl Check if we can directly use Kerberos 5 API, used for reading keytabs +dnl and automatically construction DirectoryService names from that, instead +dnl of requiring special configuration in afp.conf +AC_DEFUN([AC_NETATALK_KERBEROS], [ +AC_MSG_CHECKING([for Kerberos 5 (necessary for GetSrvrInfo:DirectoryNames support)]) +AC_ARG_WITH([kerberos], + [AS_HELP_STRING([--with-kerberos], [Kerberos 5 support (default=auto)])], + [], + [with_kerberos=auto]) +AC_MSG_RESULT($with_kerberos) + +if test x"$with_kerberos" != x"no"; then + have_krb5_header="no" + AC_CHECK_HEADERS([krb5/krb5.h krb5.h], [have_krb5_header="yes"; break]) + if test x"$have_krb5_header" = x"no" && test x"$with_kerberos" != x"auto"; then + AC_MSG_FAILURE([--with-kerberos was given, but no headers found]) + fi + + AC_PATH_PROG([KRB5_CONFIG], [krb5-config]) + AC_MSG_CHECKING([for krb5-config]) + if test -x "$KRB5_CONFIG"; then + AC_MSG_RESULT([$KRB5_CONFIG]) + KRB5_CFLAGS="`$KRB5_CONFIG --cflags krb5`" + KRB5_LIBS="`$KRB5_CONFIG --libs krb5`" + AC_SUBST(KRB5_CFLAGS) + AC_SUBST(KRB5_LIBS) + with_kerberos="yes" + else + AC_MSG_RESULT([not found]) + if test x"$with_kerberos" != x"auto"; then + AC_MSG_FAILURE([--with-kerberos was given, but krb5-config could not be found]) + fi + fi +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 AC_DEFUN([AC_NETATALK_OVERWRITE_CONFIG], [ AC_MSG_CHECKING([whether configuration files should be overwritten]) @@ -424,34 +763,53 @@ AC_MSG_CHECKING(for LDAP (necessary for client-side ACL visibility)) AC_ARG_WITH(ldap, [AS_HELP_STRING([--with-ldap], [LDAP support (default=auto)])], - [ case "$withval" in - yes|no) - with_ldap="$withval" - ;; - *) - with_ldap=auto - ;; - esac ]) -AC_MSG_RESULT($with_ldap) - -if test x"$with_ldap" != x"no" ; then - AC_CHECK_HEADER([ldap.h], with_ldap=yes, - [ if test x"$with_ldap" = x"yes" ; then + netatalk_cv_ldap=$withval, + netatalk_cv_ldap=auto + ) +AC_MSG_RESULT($netatalk_cv_ldap) + +save_CFLAGS="$CFLAGS" +save_LDFLAGS="$LDFLAGS" +save_LIBS="$LIBS" +CFLAGS="" +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" + 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 AC_MSG_ERROR([Missing LDAP headers]) fi - with_ldap=no + netatalk_cv_ldap=no ]) - AC_CHECK_LIB(ldap, ldap_init, with_ldap=yes, - [ if test x"$with_ldap" = x"yes" ; then + AC_CHECK_LIB(ldap, ldap_init, netatalk_cv_ldap=yes, + [ if test x"$netatalk_cv_ldap" = x"yes" ; then AC_MSG_ERROR([Missing LDAP library]) fi - with_ldap=no + netatalk_cv_ldap=no ]) fi -if test x"$with_ldap" = x"yes"; then +if test x"$netatalk_cv_ldap" = x"yes"; then + LDAP_CFLAGS="$CFLAGS" + LDAP_LDFLAGS="$LDFLAGS" + LDAP_LIBS="-lldap" AC_DEFINE(HAVE_LDAP,1,[Whether LDAP is available]) fi + +AC_SUBST(LDAP_CFLAGS) +AC_SUBST(LDAP_LDFLAGS) +AC_SUBST(LDAP_LIBS) +CFLAGS="$save_CFLAGS" +LDLFLAGS="$save_LDLFLAGS" +LIBS="$save_LIBS" ]) dnl Check for ACL support @@ -521,17 +879,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 ]) @@ -541,16 +897,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 @@ -608,7 +962,7 @@ case "$this_os" in *solaris*) AC_CHECK_FUNCS([attropen], - [neta_cv_eas_sys_found=yes], + [neta_cv_eas_sys_found=yes; AC_DEFINE(HAVE_EAFD, 1, [extattr API has full fledged fds for EAs])], [neta_cv_eas_sys_not_found=yes]) ;; @@ -663,18 +1017,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]) @@ -763,6 +1115,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*) @@ -785,7 +1138,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 @@ -799,15 +1152,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 +])