X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=macros%2Fnetatalk.m4;h=cb0fc717fe11daf8e074490de3e6292f0c7dc97f;hp=6ae3fab2b0d51ac2a6191652376333e40c817c2f;hb=939eb9da6116bd502cdae97f84541993848071b4;hpb=f929f4e41ead6abd4cf05d4aeca5ce1f5942e569 diff --git a/macros/netatalk.m4 b/macros/netatalk.m4 index 6ae3fab2..cb0fc717 100644 --- a/macros/netatalk.m4 +++ b/macros/netatalk.m4 @@ -1,19 +1,158 @@ 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 + 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 + 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 + 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 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, - [AS_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") ]) @@ -23,21 +162,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], [ @@ -101,7 +278,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, [ @@ -220,7 +397,7 @@ 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|solaris|systemd]]], @@ -231,37 +408,47 @@ 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 sysv support]) + 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_ERROR([illegal init-style]) @@ -276,6 +463,12 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [ 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 @@ -330,7 +523,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) @@ -556,7 +749,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" ]) @@ -624,7 +817,7 @@ AC_SUBST(LDAP_CFLAGS) AC_SUBST(LDAP_LDFLAGS) AC_SUBST(LDAP_LIBS) CFLAGS="$save_CFLAGS" -LDLFLAGS="$save_LDLFLAGS" +LDFLAGS="$save_LDFLAGS" LIBS="$save_LIBS" ]) @@ -914,7 +1107,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]