linux cache bypass by default

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index fca4196..2b818eb 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -86,21 +86,11 @@ AC_ARG_ENABLE([namei-fileserver],
          fileserver])],
     , 
     [enable_namei_fileserver="default"])
-AC_ARG_ENABLE([cache-bypass],
-    [AS_HELP_STRING([--enable-cache-bypass],
-        [enable client support for cache bypass])],
-    , 
-    [enable_cache_bypass="no"])
 AC_ARG_ENABLE([supergroups],
     [AS_HELP_STRING([--enable-supergroups],
         [enable support for nested pts groups])],
     , 
     [enable_supergroups="no"])
-AC_ARG_ENABLE([fast-restart],
-    [AS_HELP_STRING([--enable-fast-restart],
-        [enable fast startup of file server without salvaging])],
-    , 
-    [enable_fast_restart="no"])
 AC_ARG_ENABLE([bitmap-later],
     [AS_HELP_STRING([--enable-bitmap-later],
         [enable fast startup of file server by not reading bitmap till
@@ -118,8 +108,8 @@ AC_ARG_ENABLE([disconnected],
     , 
     [enable_disconnected="no"])
 AC_ARG_ENABLE([unix-sockets],
-    [AS_HELP_STRING([--enable-unix-sockets],
-        [enable use of unix domain sockets for fssync])],
+    [AS_HELP_STRING([--disable-unix-sockets],
+        [disable use of unix domain sockets for fssync (defaults to enabled)])],
     ,
     [enable_unix_sockets="yes"])
 AC_ARG_ENABLE([icmp-pmtu-discovery],
@@ -140,10 +130,6 @@ AC_ARG_ENABLE([pthreaded-ubik],
     [enable_pthreaded_ubik="no"])
 
 dnl Kernel module build options.
-AC_ARG_WITH([dux-kernel-headers],
-    [AS_HELP_STRING([--with-dux-kernel-headers=path],
-        [use the kernel headers found at path (optional, defaults to first
-         match in /usr/sys)])])
 AC_ARG_WITH([linux-kernel-headers],
     [AS_HELP_STRING([--with-linux-kernel-headers=path],
         [use the kernel headers found at path (optional, defaults to
@@ -409,10 +395,6 @@ case $system in
                MKAFS_OSTYPE=AIX
                 AC_MSG_RESULT(rs_aix)
                 ;;
-        *-osf*)
-               MKAFS_OSTYPE=DUX
-                AC_MSG_RESULT(alpha_dux)
-                ;;
         arm-*-darwin*)
                MKAFS_OSTYPE=DARWIN
                 AC_MSG_RESULT(arm_darwin)
@@ -850,9 +832,6 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 AC_CHECK_LINUX_FUNC([i_size_read],
                                     [#include <linux/fs.h>],
                                     [i_size_read(NULL);])
-                AC_CHECK_LINUX_FUNC([iget],
-                                    [#include <linux/fs.h>],
-                                    [iget(NULL, NULL);])
                 AC_CHECK_LINUX_FUNC([kernel_setsockopt],
                                     [#include <linux/net.h>],
                                     [kernel_setsockopt(NULL, 0, 0, NULL, 0);])
@@ -880,9 +859,6 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
 
                 dnl Consequences - things which get set as a result of the
                 dnl                above tests
-                AS_IF([test "x$ac_cv_linux_func_iget" = "xno"],
-                      [AC_DEFINE([LINUX_USE_FH], 1,
-                         [define to use linux file handles for cache files])])
                 AS_IF([test "x$ac_cv_linux_func_d_alloc_anon" = "xno"],
                       [AC_DEFINE([AFS_NONFSTRANS], 1,
                                  [define to disable the nfs translator])])
@@ -1001,6 +977,8 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 fi
                 :
                fi
+dnl Linux-only, but just enable always.
+               AC_DEFINE(AFS_CACHE_BYPASS, 1, [define to activate cache bypassing Unix client])
 esac
 
 AC_CACHE_CHECK([if struct sockaddr has sa_len field],
@@ -1140,10 +1118,6 @@ if test "$enable_supergroups" = "yes"; then
        AC_DEFINE(SUPERGROUPS, 1, [define if you want to have support for nested pts groups])
 fi
 
-if test "$enable_fast_restart" = "yes"; then
-       AC_DEFINE(FAST_RESTART, 1, [define if you want to have fast restart])
-fi
-
 if test "$enable_bitmap_later" = "yes"; then
        AC_DEFINE(BITMAP_LATER, 1, [define if you want to salvager to check bitmasks later])
 fi
@@ -1168,22 +1142,12 @@ else
 fi
 AC_SUBST(USE_UNIX_SOCKETS)
 
-if test "$enable_fast_restart" = "yes" &&
-   test "$enable_demand_attach_fs" = "yes" ; then
-       AC_MSG_ERROR([The Demand Attach and Fast Restart extensions are mutually exclusive.  Demand Attach fileservers automatically salvage volumes in the background, thereby making Fast Restart pointless.])
-       exit 1
-fi
-
 if test "$enable_icmp_pmtu_discovery" = "yes"; then
    if test "$ac_cv_setsockopt_iprecverr" = "yes"; then
        AC_DEFINE(ADAPT_PMTU, 1, [define if you want to decode icmp unreachable packets to discover path mtu])
    fi
 fi
 
-if test "$enable_cache_bypass" = "yes"; then
-       AC_DEFINE(AFS_CACHE_BYPASS, 1, [define to activate cache bypassing Unix client])
-fi
-
 if test "$enable_namei_fileserver" = "yes"; then
        AC_DEFINE(AFS_NAMEI_ENV, 1, [define if you want to want namei fileserver])
        VFSCK=""
@@ -1251,7 +1215,7 @@ AC_CHECK_HEADERS(stdlib.h string.h unistd.h fcntl.h sys/time.h sys/file.h grp.h)
 AC_CHECK_HEADERS(netinet/in.h netdb.h sys/fcntl.h sys/mnttab.h sys/mntent.h)
 AC_CHECK_HEADERS(mntent.h sys/vfs.h sys/param.h sys/fs_types.h sys/fstyp.h)
 AC_CHECK_HEADERS(sys/mount.h strings.h termios.h signal.h sys/pag.h)
-AC_CHECK_HEADERS(windows.h direct.h sys/ipc.h)
+AC_CHECK_HEADERS(windows.h direct.h sys/ipc.h sys/resource.h)
 AC_CHECK_HEADERS(security/pam_modules.h ucontext.h regex.h sys/statvfs.h sys/statfs.h sys/bitypes.h)
 AC_CHECK_HEADERS(linux/errqueue.h,,,[#include <linux/types.h>])
 AC_CHECK_HEADERS(et/com_err.h)
@@ -1293,10 +1257,11 @@ else
 fi
 AC_SUBST(BUILD_LOGIN)
 
-AC_CHECK_FUNCS(snprintf strlcat strlcpy flock)
+AC_CHECK_FUNCS(snprintf strlcat strlcpy flock getrlimit)
 AC_CHECK_FUNCS(setprogname getprogname sigaction mkstemp vsnprintf strerror strcasestr)
 AC_CHECK_FUNCS(setvbuf vsyslog getcwd)
 AC_CHECK_FUNCS(regcomp regexec regerror)
+AC_CHECK_FUNCS(fseeko64 ftello64)
 AC_MSG_CHECKING([for POSIX regex library])
 if test "$ac_cv_header_regex_h" = "yes" && \
        test "$ac_cv_func_regcomp" = "yes" && \
@@ -1326,6 +1291,7 @@ AC_CHECK_TYPE([socklen_t],[],
         [Define to int if <sys/socket.h> does not define.])],
 [#include <sys/types.h>
 #include <sys/socket.h>])
+AC_CHECK_TYPES(off64_t)
 AC_SIZEOF_TYPE(long)
 
 AC_HEADER_PAM_CONST
@@ -1406,7 +1372,6 @@ AC_SUBST(HTML_XSL)
 AC_SUBST(XSLTPROC)
 
 OPENAFS_OSCONF
-OPENAFS_KRB5CONF
 OPENAFS_FUSE
 
 TOP_SRCDIR="${srcdir}/src"