Windows: buf_RDRBuffersExist and cm_directIO

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index a3362f0..d84bce5 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -121,11 +121,12 @@ dnl Kernel module build options.
 AC_ARG_WITH([linux-kernel-headers],
     [AS_HELP_STRING([--with-linux-kernel-headers=path],
         [use the kernel headers found at path (optional, defaults to
-         /usr/src/linux-2.4, then /usr/src/linux)])])
+         /lib/modules/`uname -r`/build, then /lib/modules/`uname -r`/source,
+         then /usr/src/linux-2.4, and lastly /usr/src/linux)])])
 AC_ARG_WITH([linux-kernel-build],
     [AS_HELP_STRING([--with-linux-kernel-build=path],
        [use the kernel build found at path(optional, defaults to 
-       /usr/src/linux-2.4, then /usr/src/linux)])])
+       kernel headers path)])])
 AC_ARG_WITH([bsd-kernel-headers],
     [AS_HELP_STRING([--with-bsd-kernel-headers=path],
         [use the kernel headers found at path (optional, defaults to
@@ -161,6 +162,14 @@ AC_ARG_ENABLE([transarc-paths],
     , 
     [enable_transarc_paths="no"])
 
+dnl Deprecated crypto
+AC_ARG_ENABLE([kauth],
+    [AS_HELP_STRING([--disable-kauth],
+        [do not install the deprecated kauth server and utilities (defaults to
+         enabled)])],
+    ,
+    [enable_kauth="yes"])
+
 dnl Optimization and debugging flags.
 AC_ARG_ENABLE([strip-binaries],
     [AS_HELP_STRING([--disable-strip-binaries],
@@ -309,16 +318,20 @@ case $system in
                 if test "x$with_linux_kernel_headers" != "x"; then
                   LINUX_KERNEL_PATH="$with_linux_kernel_headers"
                 else
-                  LINUX_KERNEL_PATH="/lib/modules/`uname -r`/source"
-                  if test ! -f "$LINUX_KERNEL_PATH/include/linux/version.h"; then
-                    LINUX_KERNEL_PATH="/lib/modules/`uname -r`/build"
-                  fi
-                  if test ! -f "$LINUX_KERNEL_PATH/include/linux/version.h"; then
-                    LINUX_KERNEL_PATH="/usr/src/linux-2.4"
-                  fi
-                  if test ! -f "$LINUX_KERNEL_PATH/include/linux/version.h"; then
-                    LINUX_KERNEL_PATH="/usr/src/linux"
-                  fi
+                  for utsdir in "/lib/modules/`uname -r`/build" \
+                                "/lib/modules/`uname -r`/source" \
+                                "/usr/src/linux-2.4" \
+                                "/usr/src/linux"; do
+                    LINUX_KERNEL_PATH="$utsdir"
+                    for utsfile in "include/generated/utsrelease.h" \
+                                   "include/linux/utsrelease.h" \
+                                   "include/linux/version.h" \
+                                   "include/linux/version-up.h"; do
+                      if grep "UTS_RELEASE" "$utsdir/$utsfile" >/dev/null 2>&1; then
+                        break 2
+                      fi
+                    done
+                  done
                 fi
                 if test "x$with_linux_kernel_build" != "x"; then
                         LINUX_KERNEL_BUILD="$with_linux_kernel_build"
@@ -392,6 +405,7 @@ case $system in
                SOLARIS_UFSVFS_HAS_DQRWLOCK
                SOLARIS_FS_HAS_FS_ROLLED
                SOLARIS_SOLOOKUP_TAKES_SOCKPARAMS
+               SOLARIS_HAVE_VN_RENAMEPATH
                 ;;
         *-sunos*)
                MKAFS_OSTYPE=SUNOS
@@ -759,6 +773,11 @@ case $AFS_SYSNAME in
     *_obsd46)   AFS_PARAM_COMMON=param.obsd46.h  ;;
     *_obsd47)   AFS_PARAM_COMMON=param.obsd47.h  ;;
     *_obsd48)   AFS_PARAM_COMMON=param.obsd48.h  ;;
+    *_obsd49)   AFS_PARAM_COMMON=param.obsd49.h  ;;
+    *_obsd50)   AFS_PARAM_COMMON=param.obsd50.h  ;;
+    *_obsd51)   AFS_PARAM_COMMON=param.obsd51.h  ;;
+    *_obsd52)   AFS_PARAM_COMMON=param.obsd52.h  ;;
+    *_obsd53)   AFS_PARAM_COMMON=param.obsd53.h  ;;
     *_linux22)  AFS_PARAM_COMMON=param.linux22.h ;;
     *_linux24)  AFS_PARAM_COMMON=param.linux24.h ;;
     *_linux26)  AFS_PARAM_COMMON=param.linux26.h ;;
@@ -814,6 +833,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                                       [write_begin], [fs.h])
                 AC_CHECK_LINUX_STRUCT([backing_dev_info], [name],
                                       [backing-dev.h])
+                AC_CHECK_LINUX_STRUCT([cred], [session_keyring], [cred.h])
                 AC_CHECK_LINUX_STRUCT([ctl_table], [ctl_name], [sysctl.h])
                 AC_CHECK_LINUX_STRUCT([dentry_operations], [d_automount], [dcache.h])
                 AC_CHECK_LINUX_STRUCT([inode], [i_alloc_sem], [fs.h])
@@ -824,6 +844,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 AC_CHECK_LINUX_STRUCT([file_operations], [flock], [fs.h])
                 AC_CHECK_LINUX_STRUCT([file_operations], [sendfile], [fs.h])
                 AC_CHECK_LINUX_STRUCT([file_system_type], [mount], [fs.h])
+                AC_CHECK_LINUX_STRUCT([filename], [name], [fs.h])
+                AC_CHECK_LINUX_STRUCT([inode_operations], [truncate], [fs.h])
+                AC_CHECK_LINUX_STRUCT([key_type], [preparse], [key-type.h])
                 AC_CHECK_LINUX_STRUCT([nameidata], [path], [namei.h])
                 AC_CHECK_LINUX_STRUCT([proc_dir_entry], [owner], [proc_fs.h])
                 AC_CHECK_LINUX_STRUCT([super_block], [s_bdi], [fs.h])
@@ -913,10 +936,6 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                                     [#include <linux/fs.h>
                                      #include <linux/namei.h>],
                                     [path_lookup(NULL, 0, NULL);])
-                AC_CHECK_LINUX_FUNC([putname],
-                                    [#include <linux/fs.h>
-                                     #include <linux/namei.h>],
-                                    [putname(NULL);])
                 AC_CHECK_LINUX_FUNC([rcu_read_lock],
                                     [#include <linux/rcupdate.h>],
                                     [rcu_read_lock();])
@@ -993,6 +1012,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_KMAP_ATOMIC_TAKES_NO_KM_TYPE
                 LINUX_DENTRY_OPEN_TAKES_PATH
                 LINUX_D_ALIAS_IS_HLIST
+                LINUX_HLIST_ITERATOR_NO_NODE
                 LINUX_IOP_I_CREATE_TAKES_BOOL
                 LINUX_DOP_D_REVALIDATE_TAKES_UNSIGNED
                 LINUX_IOP_LOOKUP_TAKES_UNSIGNED
@@ -1313,6 +1333,7 @@ AC_CHECK_HEADERS([ \
                   math.h \
                   mntent.h \
                   ncurses.h \
+                  ncurses/ncurses.h \
                   netdb.h \
                   netinet/in.h \
                   pthread_np.h \
@@ -1450,6 +1471,13 @@ else
 fi
 AC_SUBST(BUILD_USS)
 
+if test "$enable_kauth" = yes; then
+       INSTALL_KAUTH="yes"
+else
+       INSTALL_KAUTH="no"
+fi
+AC_SUBST(INSTALL_KAUTH)
+
 AC_CHECK_FUNCS([ \
        arc4random \
        fcntl \
@@ -1463,6 +1491,7 @@ AC_CHECK_FUNCS([ \
        getrlimit \
        issetugid \
        mkstemp \
+       poll \
        pread \
        preadv \
        preadv64 \