X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fnetatalk.m4;h=8832590e7706647241869a76f239e9a121bfdf79;hb=5957fb1e5f05052f7a5e5c8d7a7b81b7b1e1c205;hp=611a8b4c49fa0dcd2adfe9a86e53b141fbd17160;hpb=90b90ec0bb317f848d6c237e980fc2cf258814ea;p=netatalk.git diff --git a/macros/netatalk.m4 b/macros/netatalk.m4 index 611a8b4c..8832590e 100644 --- a/macros/netatalk.m4 +++ b/macros/netatalk.m4 @@ -1,20 +1,56 @@ 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 Tracker, for Spotlight +AC_DEFUN([AC_NETATALK_SPOTLIGHT], [ + 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_MSG_NOTICE([searching for $ac_cv_tracker_pkg]) + + PKG_CHECK_MODULES([TRACKER], [$ac_cv_tracker_pkg >= 0.12], [ac_cv_have_tracker=yes], [ac_cv_have_tracker=no]) + + if test x"$ac_cv_have_tracker" = x"no" ; then + if test x"$need_tracker" = x"yes" ; then + AC_MSG_ERROR([$ac_cv_tracker_pkg not found]) + fi + fi + + AC_SUBST(TRACKER_CFLAGS) + AC_SUBST(TRACKER_LIBS) + AM_CONDITIONAL(HAVE_TRACKER, [test x"$ac_cv_have_tracker" = 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)] - )], + [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, use_bundled_libevent=yes ) if test x"$use_bundled_libevent" = x"yes" ; then + AC_MSG_RESULT([no]) AC_CONFIG_SUBDIRS([libevent]) + else + AC_MSG_RESULT([yes]) fi AM_CONDITIONAL(USE_BUILTIN_LIBEVENT, test x"$use_bundled_libevent" = x"yes") ]) @@ -25,12 +61,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 @@ -103,7 +143,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, [ @@ -225,7 +265,7 @@ AC_ARG_ENABLE(shell-check, dnl Check for optional sysv 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,7 +273,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]) @@ -242,32 +282,36 @@ 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 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]) ;; *) - 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) @@ -443,13 +487,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 @@ -512,6 +554,9 @@ 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], @@ -531,8 +576,10 @@ if test x"$with_kerberos" != x"no"; then AC_MSG_CHECKING([for krb5-config]) if test -x "$KRB5_CONFIG"; then AC_MSG_RESULT([$KRB5_CONFIG]) - CFLAGS="$CFLAGS `$KRB5_CONFIG --cflags krb5`" - LIBS="$LIBS `$KRB5_CONFIG --libs krb5`" + 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]) @@ -545,6 +592,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 @@ -565,34 +621,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 @@ -662,17 +737,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 ]) @@ -682,16 +755,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 @@ -804,18 +875,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]) @@ -904,6 +973,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*) @@ -926,7 +996,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 @@ -940,15 +1010,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 +])