X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fnetatalk.m4;h=51dbdcab882c17394a0b8bcdae010dc19fe2b2ee;hb=d4fdc0119a3fd21571e27aad6c3e6ff5c56ac880;hp=f7421ab55b3d38b0068f40ba22d1b58a0531e3a7;hpb=a6f27bf879450b929d5ba5aae73f6054c550964e;p=netatalk.git diff --git a/macros/netatalk.m4 b/macros/netatalk.m4 index f7421ab5..51dbdcab 100644 --- a/macros/netatalk.m4 +++ b/macros/netatalk.m4 @@ -1,19 +1,44 @@ dnl Kitchen sink for configuration macros +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 ) - - if test x"$use_bundled_libevent" = x"yes" ; then - AC_CONFIG_SUBDIRS([libevent]) + 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") ]) @@ -23,12 +48,16 @@ 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]) else @@ -101,7 +130,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, [ @@ -231,7 +260,7 @@ 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]) ;; "redhat-systemd") AC_MSG_RESULT([enabling redhat-style systemd support]) @@ -240,25 +269,25 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [ 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]) ;; "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 sysv support]) + AC_MSG_RESULT([enabling solaris-style SMF support]) ;; "systemd") - AC_MSG_RESULT([use general systemd configuration]) + AC_MSG_RESULT([enabling general systemd support]) ;; "none") AC_MSG_RESULT([disabling init-style support]) @@ -270,8 +299,6 @@ AC_DEFUN([AC_NETATALK_INIT_STYLE], [ 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) @@ -552,6 +579,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]) +CFLAGS="$save_CFLAGS" +LIBS="$save_LIBS" ]) dnl Check for overwrite the config files or not @@ -924,6 +960,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*) @@ -968,4 +1005,4 @@ AC_CACHE_CHECK([if the realpath function allows a NULL argument], 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 +])