X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=configure.ac;h=bfb578cae8108a7aa947a18cd395f2efad5384e1;hp=709107884ab30a1cad566021a904045bac2bf26e;hb=refs%2Fheads%2Ftmp%2Fv3.0.2-alex;hpb=f0c0683226449647abf1cc4708755ef5821da423 diff --git a/configure.ac b/configure.ac index 70910788..bfb578ca 100644 --- a/configure.ac +++ b/configure.ac @@ -23,8 +23,7 @@ AC_PROG_PERL AC_PROG_GREP AC_PROG_PS AM_PROG_CC_C_O - -dnl Checks for typedefs, structures, and compiler characteristics. +AC_C_BIGENDIAN AC_C_INLINE dnl Check if we can use attribute unused (gcc only) from ethereal @@ -45,12 +44,12 @@ AC_CHECK_HEADERS(netdb.h sgtty.h statfs.h dlfcn.h langinfo.h locale.h) AC_CHECK_HEADERS(sys/param.h sys/fcntl.h sys/termios.h) AC_CHECK_HEADERS(sys/mnttab.h sys/statvfs.h sys/stat.h sys/vfs.h) dnl Checks for header files, confirmed to be required as of 2011 -AC_CHECK_HEADERS(sys/epoll.h) AC_CHECK_HEADERS([sys/mount.h], , , [#ifdef HAVE_SYS_PARAM_H #include #endif ]) +AC_CHECK_TYPES([fshare_t], [], [], [[#include ]]) AC_SYS_LARGEFILE([], AC_MSG_ERROR([AFP 3.x support requires Large File Support.])) @@ -74,74 +73,23 @@ fi AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,, [#include ]) dnl these tests have been comfirmed to be needed in 2011 -AC_CHECK_FUNC(epoll_create, AC_DEFINE([HAVE_EPOLL], 1, Whether Linux epoll is available)) AC_CHECK_FUNCS(backtrace_symbols dirfd getusershell pread pwrite pselect) -AC_CHECK_FUNCS(setlinebuf strlcat strlcpy strnlen) +AC_CHECK_FUNCS(setlinebuf strlcat strlcpy strnlen mempcpy) AC_CHECK_FUNCS(mmap utime getpagesize) dnl needed by tbd dnl search for necessary libraries AC_SEARCH_LIBS(gethostbyname, nsl) AC_SEARCH_LIBS(connect, socket) -AC_SEARCH_LIBS(pthread_sigmask, pthread,,[AC_MSG_ERROR([missing pthread_sigmask])]) -if test x"$ac_cv_search_pthread_sigmask" != x"none required" ; then - PTHREAD_LIBS=$ac_cv_search_pthread_sigmask -fi -AC_SUBST(PTHREAD_LIBS) +AX_PTHREAD(, [AC_MSG_ERROR([missing pthread_sigmask])]) AC_DEFINE(OPEN_NOFOLLOW_ERRNO, ELOOP, errno returned by open with O_NOFOLLOW) -AC_CACHE_SAVE - -dnl -------------------------------------------------------------------------- dnl 64bit platform check -dnl -------------------------------------------------------------------------- - -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 -------------------------------------------------------------------------- -dnl OS specific configuration comes in here: -dnl -------------------------------------------------------------------------- +AC_NETATALK_64BIT_LIBS +dnl OS specific checks AC_NETATALK_OS_SPECIFIC -dnl -------------------------------------------------------------------------- -dnl specific configuration comes in here: -dnl -------------------------------------------------------------------------- - dnl Check for optional admin group support AC_NETATALK_ADMIN_GROUP @@ -184,14 +132,11 @@ AC_NETATALK_SHADOW dnl Check for optional valid-shell-check support AC_NETATALK_SHELL_CHECK -dnl Check for optional Webmin -AC_NETATALK_WEBMIN - dnl Check for optional sysv initscript install -AC_NETATALK_SYSV_STYLE +AC_NETATALK_INIT_STYLE dnl Path where UAM modules shall be installed -AC_ARG_WITH(uams-path, [ --with-uams-path=PATH path to UAMs [[PKGCONF/uams]]], [uams_path="$withval"], [uams_path="${PKGCONFDIR}/uams"]) +AC_ARG_WITH(uams-path, [ --with-uams-path=PATH path to UAMs [[$libdir/netatalk/]]], [uams_path="$withval/"], [uams_path="$libdir/netatalk/"]) dnl Check for libgcrypt, if found enables DHX2 UAM AC_NETATALK_PATH_LIBGCRYPT([1:1.2.3]) @@ -211,6 +156,9 @@ AC_NETATALK_PGP_UAM dnl Check for building Kerberos V UAM module AC_NETATALK_KRB5_UAM +dnl Check for Kerberos 5 support +AC_NETATALK_KERBEROS + dnl Check for overwrite the config files or not AC_NETATALK_OVERWRITE_CONFIG @@ -223,70 +171,32 @@ AC_NETATALK_ACL dnl Check for Extended Attributes support AC_NETATALK_EXTENDED_ATTRIBUTES -dnl Check for libsmbsharemodes from Samba for Samba/Netatalk access/deny/share modes interop -AC_NETATALK_SMB_SHAREMODES - dnl Check if realpath() takes NULL AC_NETATALK_REALPATH dnl Check for sendfile() AC_NETATALK_SENDFILE -dnl -------------------------------------------------------------------------- -dnl FHS stuff has to be done last because it overrides other defaults -dnl -------------------------------------------------------------------------- +dnl Check whether bundled libevent shall not be used +AC_NETATALK_LIBEVENT -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 - uams_path="${libdir}/netatalk" - sysconfdir="/etc" - PKGCONFDIR=${sysconfdir}/netatalk - SERVERTEXT="${PKGCONFDIR}/msg" - use_pam_so=yes - mandir="/usr/share/man" - AC_DEFINE(FHS_COMPATIBILITY, 1, [Define if you want compatibily with the FHS]) - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi - ],[ - AC_MSG_RESULT([no]) - ] -) - -dnl -------------------------------------------------------------------------- -dnl post-FHS substitutions, etc -dnl -------------------------------------------------------------------------- - -UAMS_PATH="${uams_path}" -AC_SUBST(UAMS_PATH) +dnl FHS stuff has to be done last because it overrides other defaults +AC_NETATALK_FHS -dnl -------------------------------------------------------------------------- -dnl drop in includes for top level directory structures here... -dnl -------------------------------------------------------------------------- +AC_DEVELOPER -dnl Note: $(top_srcdir)/include should be added before all other includes -dnl so that includes from that directory a preferred to includes from -dnl /usr/include or similar places. -LIBS="$LIBS -L\$(top_srcdir)/libatalk" CFLAGS="-I\$(top_srcdir)/include -I\$(top_srcdir)/sys $CFLAGS" +UAMS_PATH="${uams_path}" - -dnl -------------------------------------------------------------------------- -dnl Last minute substitutions -dnl -------------------------------------------------------------------------- - -dnl ac_cv_target_os is now host_os, ac_cv_target_cpu is now host_cpu AC_SUBST(LIBS) AC_SUBST(CFLAGS) +AC_SUBST(UAMS_PATH) AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes) AM_CONDITIONAL(HAVE_LIBGCRYPT, test x$neta_cv_have_libgcrypt = xyes) AM_CONDITIONAL(HAVE_OPENSSL, test x$neta_cv_have_openssl = xyes) AM_CONDITIONAL(HAVE_ACLS, test x"$with_acl_support" = x"yes") -AM_CONDITIONAL(HAVE_LDAP, test x"$with_ldap" = x"yes") +AM_CONDITIONAL(HAVE_LDAP, test x"$netatalk_cv_ldap" = x"yes") AM_CONDITIONAL(USE_DHX, test x$neta_cv_compile_dhx = xyes) AM_CONDITIONAL(USE_DHX2, test x$neta_cv_compile_dhx2 = xyes) AM_CONDITIONAL(USE_RANDNUM, test x$neta_cv_have_openssl = xyes) @@ -297,9 +207,12 @@ AM_CONDITIONAL(USE_PGP, test x$compile_pgp = xyes) AM_CONDITIONAL(DEFAULT_HOOK, test x$neta_cv_have_libgcrypt != xyes && test x$neta_cv_have_openssl != xyes) AM_CONDITIONAL(USE_BDB, test x$bdb_required = xyes) AM_CONDITIONAL(HAVE_ATFUNCS, test x"$ac_neta_haveatfuncs" = x"yes") +AM_CONDITIONAL(USE_SHADOWPW, test x$shadowpw = xyes) -dnl --------------------- generate files +dnl Enable silent Automake rules if present +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) +dnl --------------------- generate files AC_OUTPUT([Makefile bin/Makefile bin/ad/Makefile @@ -326,6 +239,7 @@ AC_OUTPUT([Makefile etc/Makefile etc/afpd/Makefile etc/cnid_dbd/Makefile + etc/netatalk/Makefile etc/uams/Makefile include/Makefile include/atalk/Makefile