Linux: Reorder the tests
[openafs.git] / acinclude.m4
index 3a94f47..3895628 100644 (file)
@@ -5,13 +5,8 @@ dnl NB: Because this code is a macro, references to positional shell
 dnl parameters must be done like $[]1 instead of $1
 
 AC_DEFUN([OPENAFS_CONFIGURE_COMMON],[
-AH_VERBATIM([RCSID],
-[#define RCSID(msg) \
-static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
-#undef HAVE_CONNECT
-#undef HAVE_GETHOSTBYNAME
+AH_BOTTOM([
 #undef HAVE_RES_SEARCH
-#undef HAVE_SOCKET
 #undef STRUCT_SOCKADDR_HAS_SA_LEN
 #if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
 # if ENDIANESS_IN_SYS_PARAM_H
@@ -50,41 +45,20 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
  * try and reduce potential confusion. 
  */
 #define _FILE_OFFSET_BITS 64
+#define AFS_CACHE_VNODE_PATH
 #endif
 
-#undef AFS_AFSDB_ENV
-#undef AFS_LARGEFILE_ENV
 #undef AFS_NAMEI_ENV
 #undef BITMAP_LATER
-#undef BOS_RESTRICTED_MODE
-#undef BOS_NEW_CONFIG
 #undef FAST_RESTART
-#undef FULL_LISTVOL_SWITCH
-#undef COMPLETION_H_EXISTS
 #undef DEFINED_FOR_EACH_PROCESS
 #undef DEFINED_PREV_TASK
-#undef EXPORTED_KALLSYMS_ADDRESS
-#undef EXPORTED_KALLSYMS_SYMBOL
 #undef EXPORTED_SYS_CALL_TABLE
 #undef EXPORTED_IA32_SYS_CALL_TABLE
-#undef EXPORTED_TASKLIST_LOCK
-#undef INODE_SETATTR_NOT_VOID
 #undef IRIX_HAS_MEM_FUNCS
 #undef RECALC_SIGPENDING_TAKES_VOID
-#undef STRUCT_ADDRESS_SPACE_HAS_GFP_MASK
-#undef STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK
 #undef STRUCT_FS_HAS_FS_ROLLED
-#undef STRUCT_INODE_HAS_I_DEVICES
-#undef STRUCT_INODE_HAS_I_DIRTY_DATA_BUFFERS
-#undef STRUCT_INODE_HAS_I_ALLOC_SEM
-#undef STRUCT_INODE_HAS_I_TRUNCATE_SEM
-#undef STRUCT_TASK_STRUCT_HAS_PARENT
-#undef STRUCT_TASK_STRUCT_HAS_REAL_PARENT
-#undef STRUCT_TASK_STRUCT_HAS_SIG
-#undef STRUCT_TASK_STRUCT_HAS_SIGHAND
-#undef STRUCT_TASK_STRUCT_HAS_SIGMASK_LOCK
 #undef ssize_t
-#undef HAVE_STRUCT_BUF
 #undef HAVE_ARPA_NAMESER_COMPAT_H
 /* glue for RedHat kernel bug */
 #undef ENABLE_REDHAT_BUILDSYS
@@ -102,30 +76,10 @@ AC_ARG_WITH([afs-sysname],
     [AS_HELP_STRING([--with-afs-sysname=sys], [use sys for the afs sysname])])
 
 dnl General feature options.
-AC_ARG_ENABLE([afsdb],
-    [AS_HELP_STRING([--disable-afsdb], [disable AFSDB DNS RR support])],
-    ,
-    [enable_afsdb="yes"])
 AC_ARG_ENABLE([pam],
     [AS_HELP_STRING([--disable-pam], [disable PAM support])],
     ,
     [enable_pam="yes"])
-AC_ARG_ENABLE([bos-restricted-mode],
-    [AS_HELP_STRING([--enable-bos-restricted-mode],
-        [enable bosserver restricted mode which disables certain bosserver
-         functionality])],
-    , 
-    [enable_bos_restricted_mode="no"])
-AC_ARG_ENABLE([bos-new-config],
-    [AS_HELP_STRING([--enable-bos-new-config],
-        [enable bosserver pickup of BosConfig.new on restarts])],
-    ,
-    [enable_bos_new_config="no"])
-AC_ARG_ENABLE([largefile-fileserver],
-    [AS_HELP_STRING([--disable-largefile-fileserver],
-        [disable large file support in fileserver])],
-    ,
-    [enable_largefile_fileserver="yes"])
 AC_ARG_ENABLE([namei-fileserver],
     [AS_HELP_STRING([--enable-namei-fileserver],
         [force compilation of namei fileserver in preference to inode
@@ -168,11 +122,6 @@ AC_ARG_ENABLE([unix-sockets],
         [enable use of unix domain sockets for fssync])],
     ,
     [enable_unix_sockets="yes"])
-AC_ARG_ENABLE([full-vos-listvol-switch],
-    [AS_HELP_STRING([--disable-full-vos-listvol-switch],
-        [disable vos full listvol switch for formatted output])],
-    , 
-    [enable_full_vos_listvol_switch="yes"])
 AC_ARG_ENABLE([icmp-pmtu-discovery],
     [AS_HELP_STRING([--enable-icmp-pmtu-discovery],
         [enable path MTU discovery by decoding ICMP unreachable replies])],
@@ -189,12 +138,6 @@ AC_ARG_ENABLE([pthreaded-ubik],
          disabled)])],
     ,
     [enable_pthreaded_ubik="no"])
-AC_ARG_ENABLE([linux-fh],
-    [AS_HELP_STRING([--enable-linux-fh],
-        [enable opening cache files by file hande instead of inode numbers
-         with linux (defaults to disabled)])],
-    ,
-    [enable_linux_fh="no"])
 
 dnl Kernel module build options.
 AC_ARG_WITH([dux-kernel-headers],
@@ -269,6 +212,12 @@ AC_ARG_ENABLE([warnings],
          disabled)])],
     ,
     [enable_warnings="no"])
+AC_ARG_ENABLE([checking],
+    [AS_HELP_STRING([--enable-checking],
+       [turn compilation warnings into errors when building with gcc (defaults
+        to disabled)])],
+    [enable_checking="$enableval"],
+    [enable_checking="no"])
 AC_ARG_ENABLE([debug-kernel],
     [AS_HELP_STRING([--enable-debug-kernel],
         [enable compilation of the kernel module with debugging information
@@ -305,7 +254,25 @@ AC_ARG_ENABLE([optimize-pam],
          enabled)])],
     ,
     [enable_optimize_pam="yes"])
-
+AC_ARG_ENABLE([linux-syscall-probing],
+    [AS_HELP_STRING([--disable-linux-syscall-probing],
+       [disabling Linux syscall probing (defaults to enabled)])],
+    ,
+    [AC_DEFINE(ENABLE_LINUX_SYSCALL_PROBING, 1, 
+       [define to enable syscall table probes])])
+    
+
+AC_ARG_WITH([xslt-processor],
+       AS_HELP_STRING([--with-xslt-processor=ARG],
+       [which XSLT processor to use (possible choices are: libxslt, saxon, xalan-j, xsltproc)]),
+               XSLTPROC="$withval",
+               XSLTPROC="libxslt")
+
+AC_ARG_WITH([html-xsl], 
+        AS_HELP_STRING([--with-html-xsl],
+       [build HTML documentation using Norman Walsh's DocBook XSL stylesheets (default is no; specify a path to chunk.xsl or docbook.xsl)]),
+       HTML_XSL="$withval",
+       HTML_XSL=no)
 
 enable_login="no"
 
@@ -317,8 +284,6 @@ dnl AC_MINIX
 dnl Various compiler setup.
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
-AC_TYPE_SIGNAL
-COMPILER_HAS_FUNCTION_MACRO
 
 dnl Checks for programs.
 AC_PROG_INSTALL
@@ -328,6 +293,7 @@ AC_PROG_YACC
 AM_PROG_LEX
 
 OPENAFS_CHECK_BIGENDIAN
+OPENAFS_PRINTF_TAKES_Z_LEN
 
 AC_MSG_CHECKING(your OS)
 system=$host
@@ -358,34 +324,39 @@ case $system in
                 else
                   LINUX_KERNEL_BUILD=$LINUX_KERNEL_PATH
                 fi
-               if test -f "$LINUX_KERNEL_BUILD/include/linux/utsrelease.h"; then
-                linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/linux/utsrelease.h |awk 'BEGIN { FS="\"" } { print $[]2 }'|tail -n 1`
-                LINUX_VERSION="$linux_kvers"
-               else
-                if test -f "$LINUX_KERNEL_BUILD/include/linux/version.h"; then
-                 linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/linux/version.h |awk 'BEGIN { FS="\"" } { print $[]2 }'|tail -n 1`
-                 if test "x$linux_kvers" = "x"; then
-                   if test -f "$LINUX_KERNEL_BUILD/include/linux/version-up.h"; then
-                     linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/linux/version-up.h |awk 'BEGIN { FS="\"" } { print $[]2 }'|tail -n 1`
-                     if test "x$linux_kvers" = "x"; then
-
-                       AC_MSG_ERROR(Linux headers lack version definition [2])
-                       exit 1
-                     else
-                       LINUX_VERSION="$linux_kvers"
-                      fi
-                    else
-                      AC_MSG_ERROR(Linux headers lack version definition)
-                     exit 1
-                   fi
-                 else
-                   LINUX_VERSION="$linux_kvers"
-                 fi
+                 if test -f "$LINUX_KERNEL_BUILD/include/generated/utsrelease.h"; then
+                  linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/generated/utsrelease.h |awk 'BEGIN { FS="\"" } { print $[]2 }'|tail -n 1`
+                  LINUX_VERSION="$linux_kvers"
                 else
-                    enable_kernel_module="no"
-                 fi
-               fi
-                if test ! -f "$LINUX_KERNEL_BUILD/include/linux/autoconf.h"; then
+                   if test -f "$LINUX_KERNEL_BUILD/include/linux/utsrelease.h"; then
+                    linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/linux/utsrelease.h |awk 'BEGIN { FS="\"" } { print $[]2 }'|tail -n 1`
+                    LINUX_VERSION="$linux_kvers"
+                   else
+                    if test -f "$LINUX_KERNEL_BUILD/include/linux/version.h"; then
+                      linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/linux/version.h |awk 'BEGIN { FS="\"" } { print $[]2 }'|tail -n 1`
+                      if test "x$linux_kvers" = "x"; then
+                        if test -f "$LINUX_KERNEL_BUILD/include/linux/version-up.h"; then
+                          linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_BUILD/include/linux/version-up.h |awk 'BEGIN { FS="\"" } { print $[]2 }'|tail -n 1`
+                          if test "x$linux_kvers" = "x"; then
+                            AC_MSG_ERROR(Linux headers lack version definition [2])
+                            exit 1
+                          else
+                            LINUX_VERSION="$linux_kvers"
+                           fi
+                         else
+                           AC_MSG_ERROR(Linux headers lack version definition)
+                          exit 1
+                        fi
+                      else
+                        LINUX_VERSION="$linux_kvers"
+                      fi
+                    else
+                       enable_kernel_module="no"
+                     fi
+                   fi
+                fi
+                if test ! -f "$LINUX_KERNEL_BUILD/include/generated/autoconf.h" &&
+                   test ! -f "$LINUX_KERNEL_BUILD/include/linux/autoconf.h"; then
                     enable_kernel_module="no"
                 fi
                 if test "x$enable_kernel_module" = "xno"; then
@@ -410,9 +381,11 @@ case $system in
         *-solaris*)
                MKAFS_OSTYPE=SOLARIS
                 AC_MSG_RESULT(sun4)
+               AC_PATH_PROG(SOLARISCC, [cc], ,
+                   [/opt/SUNWspro/bin:/opt/SunStudioExpress/bin])
                SOLARIS_UFSVFS_HAS_DQRWLOCK
-               SOLARIS_PROC_HAS_P_COREFILE
                SOLARIS_FS_HAS_FS_ROLLED
+               SOLARIS_SOLOOKUP_TAKES_SOCKPARAMS
                 ;;
         *-sunos*)
                MKAFS_OSTYPE=SUNOS
@@ -461,10 +434,18 @@ case $system in
                MKAFS_OSTYPE=NBSD
                AC_MSG_RESULT(nbsd)
                ;;
-       *-openbsd*)
+       x86_64-*-openbsd*)
+               MKAFS_OSTYPE=OBSD
+               AC_MSG_RESULT(amd64_obsd)
+               ;;
+       i386-openbsd*)
                MKAFS_OSTYPE=OBSD
                AC_MSG_RESULT(i386_obsd)
                ;;
+       *-dragonfly*)
+               MKAFS_OSTYPE=DFBSD
+               AC_MSG_RESULT(i386_dfbsd)
+               ;;
         *)
                 AC_MSG_RESULT($system)
                 ;;
@@ -487,6 +468,12 @@ else
                        vm=${v#*.}
                        AFS_SYSNAME="sparc64_obsd${vM}${vm}"
                        ;;
+               x86_64-*-openbsd?.?)
+                       v=${host#*openbsd}
+                       vM=${v%.*}
+                       vm=${v#*.}
+                       AFS_SYSNAME="amd64_obsd${vM}${vm}"
+                       ;;
                i?86-*-freebsd?.*)
                        v=${host#*freebsd}
                        vM=${v%.*}
@@ -499,6 +486,12 @@ else
                        vm=${v#*.}
                        AFS_SYSNAME="amd64_fbsd_${vM}${vm}"
                        ;;
+               i386-*-dragonfly2.2*)
+                       AFS_SYSNAME="i386_dfbsd_23"
+                       ;;
+               i386-*-dragonfly2.3*)
+                       AFS_SYSNAME="i386_dfbsd_23"
+                       ;;
                i?86-*-netbsd*1.5*)
                        AFS_SYSNAME="i386_nbsd15"
                        ;;
@@ -518,10 +511,12 @@ else
                        AFS_SYSNAME="amd64_nbsd20"
                        ;;
                x86_64-*-netbsd*3.[[0-8]]*)
+# XXX AFS_PARAM_COMMON handled separately, redundant?
                        AFS_PARAM_COMMON=param.nbsd30.h
                        AFS_SYSNAME="amd64_nbsd30"
                        ;;
                x86_64-*-netbsd*4.[[0-8]]*)
+# XXX AFS_PARAM_COMMON handled separately, redundant?
                        AFS_PARAM_COMMON=param.nbsd40.h
                        AFS_SYSNAME="amd64_nbsd40"
                        ;;
@@ -573,69 +568,9 @@ else
                hppa*-hp-hpux10*)
                        AFS_SYSNAME="hp_ux102"
                        ;;
-               powerpc-apple-darwin1.2*)
-                       AFS_SYSNAME="ppc_darwin_12"
-                       ;;
-               powerpc-apple-darwin1.3*)
-                       AFS_SYSNAME="ppc_darwin_13"
-                       ;;
-               powerpc-apple-darwin1.4*)
-                       AFS_SYSNAME="ppc_darwin_14"
-                       ;;
-               powerpc-apple-darwin5.1*)
-                       AFS_SYSNAME="ppc_darwin_14"
-                       ;;
-               powerpc-apple-darwin5.2*)
-                       AFS_SYSNAME="ppc_darwin_14"
-                       ;;
-               powerpc-apple-darwin5.3*)
-                       AFS_SYSNAME="ppc_darwin_14"
-                       ;;
-               powerpc-apple-darwin5.4*)
-                       AFS_SYSNAME="ppc_darwin_14"
-                       ;;
-               powerpc-apple-darwin5.5*)
-                       AFS_SYSNAME="ppc_darwin_14"
-                       ;;
-               powerpc-apple-darwin6.0*)
-                       AFS_SYSNAME="ppc_darwin_60"
-                       ;;
-               powerpc-apple-darwin6.1*)
-                       AFS_SYSNAME="ppc_darwin_60"
-                       ;;
-               powerpc-apple-darwin6.2*)
-                       AFS_SYSNAME="ppc_darwin_60"
-                       ;;
-               powerpc-apple-darwin6.3*)
-                       AFS_SYSNAME="ppc_darwin_60"
-                       ;;
-               powerpc-apple-darwin6.4*)
-                       AFS_SYSNAME="ppc_darwin_60"
-                       ;;
-               powerpc-apple-darwin6.5*)
-                       AFS_SYSNAME="ppc_darwin_60"
-                       ;;
-               powerpc-apple-darwin7.0*)
-                       AFS_SYSNAME="ppc_darwin_70"
-                       ;;
-               powerpc-apple-darwin7.1*)
-                       AFS_SYSNAME="ppc_darwin_70"
-                       ;;
-               powerpc-apple-darwin7.2*)
-                       AFS_SYSNAME="ppc_darwin_70"
-                       ;;
-               powerpc-apple-darwin7.3*)
-                       AFS_SYSNAME="ppc_darwin_70"
-                       ;;
-               powerpc-apple-darwin7.4*)
+               powerpc-apple-darwin7*)
                        AFS_SYSNAME="ppc_darwin_70"
                        ;;
-               powerpc-apple-darwin7.5*)
-                       AFS_SYSNAME="ppc_darwin_70"
-                       ;;
-               powerpc-apple-darwin8.0*)
-                       AFS_SYSNAME="ppc_darwin_80"
-                       ;;
                powerpc-apple-darwin8.*)
                        AFS_SYSNAME="ppc_darwin_80"
                        ;;
@@ -648,6 +583,9 @@ else
                i386-apple-darwin9.*)
                        AFS_SYSNAME="x86_darwin_90"
                        ;;
+               i?86-apple-darwin10.*)
+                       AFS_SYSNAME="x86_darwin_100"
+                       ;;
                sparc-sun-solaris2.5*)
                        AFS_SYSNAME="sun4x_55"
                        enable_login="yes"
@@ -728,6 +666,9 @@ else
                i?86-*-linux*)
                        AFS_SYSNAME="i386_linuxXX"
                        ;;
+               arm*-linux*)
+                       AFS_SYSNAME="arm_linuxXX"
+                       ;;
                parisc-*-linux-gnu|hppa-*-linux-gnu)
                        AFS_SYSNAME="parisc_linuxXX"
                        enable_pam="no"
@@ -758,7 +699,7 @@ else
                        ;;
                x86_64-*-linux-gnu)
                        AFS_SYSNAME="amd64_linuxXX"
-                       enable_pam="no"
+                       enable_pam="yes"
                        ;;
                *)
                        AC_MSG_ERROR(An AFS sysname is required)
@@ -772,10 +713,8 @@ else
                        fi
                        _AFS_SYSNAME=`echo $AFS_SYSNAME|sed s/XX\$/$AFS_SYSKVERS/`
                        AFS_SYSNAME="$_AFS_SYSNAME"
-                       save_CPPFLAGS="$CPPFLAGS"
-                       CPPFLAGS="-I${LINUX_KERNEL_PATH}/include $CPPFLAGS"
-                       AC_TRY_COMPILE(
-                        [#include <linux/autoconf.h>],
+                       AC_TRY_KBUILD(
+                        [],
                         [#ifndef CONFIG_USERMODE
                          #error not UML
                          #endif],
@@ -783,13 +722,19 @@ else
                        if test "${ac_cv_linux_is_uml}" = yes; then
                         _AFS_SYSNAME=`echo $AFS_SYSNAME|sed s/linux/umlinux/`
                        fi
-                       CPPFLAGS="$save_CPPFLAGS"
                        AFS_SYSNAME="$_AFS_SYSNAME"
                        ;;
        esac
         AC_MSG_RESULT($AFS_SYSNAME)
 fi
 
+case $AFS_SYSNAME in
+       *_darwin*)
+               DARWIN_PLIST=src/libafs/afs.${AFS_SYSNAME}.plist
+               DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist
+               ;;
+esac
+
 dnl Some hosts have a separate common param file they should include.  Figure
 dnl out if we're on one of them now that we know the sysname.
 case $AFS_SYSNAME in
@@ -799,6 +744,22 @@ case $AFS_SYSNAME in
     *_nbsd21)   AFS_PARAM_COMMON=param.nbsd21.h  ;;
     *_nbsd30)   AFS_PARAM_COMMON=param.nbsd30.h  ;;
     *_nbsd40)   AFS_PARAM_COMMON=param.nbsd40.h  ;;
+    *_obsd31)   AFS_PARAM_COMMON=param.obsd31.h  ;;
+    *_obsd32)   AFS_PARAM_COMMON=param.obsd32.h  ;;
+    *_obsd33)   AFS_PARAM_COMMON=param.obsd33.h  ;;
+    *_obsd34)   AFS_PARAM_COMMON=param.obsd34.h  ;;
+    *_obsd35)   AFS_PARAM_COMMON=param.obsd35.h  ;;
+    *_obsd36)   AFS_PARAM_COMMON=param.obsd36.h  ;;
+    *_obsd37)   AFS_PARAM_COMMON=param.obsd37.h  ;;
+    *_obsd38)   AFS_PARAM_COMMON=param.obsd38.h  ;;
+    *_obsd39)   AFS_PARAM_COMMON=param.obsd39.h  ;;
+    *_obsd40)   AFS_PARAM_COMMON=param.obsd40.h  ;;
+    *_obsd41)   AFS_PARAM_COMMON=param.obsd41.h  ;;
+    *_obsd42)   AFS_PARAM_COMMON=param.obsd42.h  ;;
+    *_obsd43)   AFS_PARAM_COMMON=param.obsd43.h  ;;
+    *_obsd44)   AFS_PARAM_COMMON=param.obsd44.h  ;;
+    *_obsd45)   AFS_PARAM_COMMON=param.obsd45.h  ;;
+    *_obsd46)   AFS_PARAM_COMMON=param.obsd46.h  ;;
     *_linux22)  AFS_PARAM_COMMON=param.linux22.h ;;
     *_linux24)  AFS_PARAM_COMMON=param.linux24.h ;;
     *_linux26)  AFS_PARAM_COMMON=param.linux26.h ;;
@@ -826,107 +787,167 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 OPENAFS_GCC_SUPPORTS_NO_COMMON
                 OPENAFS_GCC_SUPPORTS_PIPE
                 AC_SUBST(LINUX_GCC_KOPTS)
-                ifdef([OPENAFS_CONFIGURE_LIBAFS],
-                  [LINUX_BUILD_VNODE_FROM_INODE(src/config,src/afs)],
-                  [LINUX_BUILD_VNODE_FROM_INODE(${srcdir}/src/config,src/afs/LINUX,${srcdir}/src/afs/LINUX)]
-                )
 
-                 LINUX_KBUILD_USES_EXTRA_CFLAGS
+                dnl Setup the kernel build environment
+                LINUX_KBUILD_USES_EXTRA_CFLAGS
                 LINUX_KERNEL_COMPILE_WORKS
-                LINUX_EXPORTS_FIND_TASK_BY_PID
+
+                dnl Check for header files
+                AC_CHECK_LINUX_HEADER([config.h])
+                AC_CHECK_LINUX_HEADER([completion.h])
+                AC_CHECK_LINUX_HEADER([exportfs.h])
+                AC_CHECK_LINUX_HEADER([freezer.h])
+                AC_CHECK_LINUX_HEADER([key-type.h])
+                AC_CHECK_LINUX_HEADER([semaphore.h])
+                AC_CHECK_LINUX_HEADER([seq_file.h])
+
+                dnl Check for structure elements
+                AC_CHECK_LINUX_STRUCT([address_space_operations],
+                                      [write_begin], [fs.h])
+                AC_CHECK_LINUX_STRUCT([backing_dev_info], [name],
+                                      [backing-dev.h])
+                AC_CHECK_LINUX_STRUCT([inode], [i_alloc_sem], [fs.h])
+                AC_CHECK_LINUX_STRUCT([inode], [i_blkbits], [fs.h])
+                AC_CHECK_LINUX_STRUCT([inode], [i_blksize], [fs.h])
+                AC_CHECK_LINUX_STRUCT([inode], [i_mutex], [fs.h])
+                AC_CHECK_LINUX_STRUCT([inode], [i_security], [fs.h])
+                AC_CHECK_LINUX_STRUCT([file_operations], [flock], [fs.h])
+                AC_CHECK_LINUX_STRUCT([file_operations], [sendfile], [fs.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])
+                AC_CHECK_LINUX_STRUCT([super_operations], [alloc_inode],
+                                      [fs.h])
+                 AC_CHECK_LINUX_STRUCT([task_struct], [cred], [sched.h])
+                AC_CHECK_LINUX_STRUCT([task_struct], [exit_state], [sched.h])
+                AC_CHECK_LINUX_STRUCT([task_struct], [parent], [sched.h])
+                AC_CHECK_LINUX_STRUCT([task_struct], [real_parent], [sched.h])
+                AC_CHECK_LINUX_STRUCT([task_struct], [rlim], [sched.h])
+                AC_CHECK_LINUX_STRUCT([task_struct], [sig], [sched.h])
+                AC_CHECK_LINUX_STRUCT([task_struct], [sighand], [sched.h])
+                AC_CHECK_LINUX_STRUCT([task_struct], [sigmask_lock], [sched.h])
+                AC_CHECK_LINUX_STRUCT([task_struct], [tgid], [sched.h])
+                AC_CHECK_LINUX_STRUCT([task_struct], [thread_info], [sched.h])
+                LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_SIGNAL_RLIM
+
+                dnl Function existence checks
+
+                 AC_CHECK_LINUX_FUNC([bdi_init],
+                                    [#include <linux/backing-dev.h>],
+                                    [bdi_init(NULL);])
+                AC_CHECK_LINUX_FUNC([ctl_table], [ctl_name], [sysctl.h])
+                AC_CHECK_LINUX_FUNC([current_kernel_time],
+                                    [#include <linux/time.h>],
+                                    [struct timespec s;
+                                     s = current_kernel_time();])
+                AC_CHECK_LINUX_FUNC([d_alloc_anon],
+                                    [#include <linux/dcache.h>],
+                                    [d_alloc_anon(NULL);])
+                AC_CHECK_LINUX_FUNC([do_sync_read],
+                                    [#include <linux/fs.h>],
+                                    [do_sync_read(NULL, NULL, 0, NULL);])
+                AC_CHECK_LINUX_FUNC([find_task_by_pid],
+                                    [#include <linux/sched.h>],
+                                    [pid_t p; find_task_by_pid(p);])
+                AC_CHECK_LINUX_FUNC([generic_file_aio_read],
+                                    [#include <linux/fs.h>],
+                                    [generic_file_aio_read(NULL,NULL,0,0);])
+                AC_CHECK_LINUX_FUNC([grap_cache_page_write_begin],
+                                    [#include <linux/pagemap.h>],
+                                    [grab_cache_page_write_begin(NULL, 0, 0);])
+                AC_CHECK_LINUX_FUNC([hlist_unhashed],
+                                    [#include <linux/list.h>],
+                                    [hlist_unhashed(0);])
+                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);])
+                AC_CHECK_LINUX_FUNC([page_follow_link],
+                                    [#include <linux/fs.h>],
+                                    [page_follow_link(0,0);])
+                AC_CHECK_LINUX_FUNC([page_offset],
+                                    [#include <linux/pagemap.h>],
+                                    [page_offset(NULL);])
+                AC_CHECK_LINUX_FUNC([pagevec_lru_add_file],
+                                    [#include <linux/pagevec.h>],
+                                    [__pagevec_lru_add_file(NULL);])
+                AC_CHECK_LINUX_FUNC([rcu_read_lock],
+                                    [#include <linux/rcupdate.h>],
+                                    [rcu_read_lock();])
+                AC_CHECK_LINUX_FUNC([splice_direct_to_actor],
+                                    [#include <linux/splice.h>],
+                                    [splice_direct_to_actor(NULL,NULL,NULL);])
+                AC_CHECK_LINUX_FUNC([svc_addr_in],
+                                    [#include <linux/sunrpc/svc.h>],
+                                    [svc_addr_in(NULL);])
+                AC_CHECK_LINUX_FUNC([vfs_llseek],
+                                    [#include <linux/fs.h>],
+                                    [vfs_llseek(NULL, 0, 0);])
+                AC_CHECK_LINUX_FUNC([zero_user_segments],
+                                    [#include <linux/highmem.h>],
+                                    [zero_user_segments(NULL, 0, 0, 0, 0);])
+
+                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])])
+
+                dnl Assorted more complex tests
                 LINUX_EXPORTS_PROC_ROOT_FS
-                 LINUX_HAVE_CURRENT_KERNEL_TIME
-                LINUX_HAVE_WRITE_BEGIN_AOP
-                 LINUX_HAVE_BDI_INIT
                  LINUX_KMEM_CACHE_INIT
                 LINUX_HAVE_KMEM_CACHE_T
-                LINUX_KMEM_CACHE_CREATE_TAKES_DTOR
+                LINUX_KMEM_CACHE_CREATE_CTOR_TAKES_VOID
                 LINUX_D_PATH_TAKES_STRUCT_PATH
                 LINUX_NEW_EXPORT_OPS
-                LINUX_CONFIG_H_EXISTS
-                LINUX_COMPLETION_H_EXISTS
-                LINUX_SEMAPHORE_H_EXISTS
-                LINUX_EXPORTFS_H_EXISTS
-                LINUX_DEFINES_FOR_EACH_PROCESS
-                LINUX_DEFINES_PREV_TASK
-                LINUX_FS_STRUCT_SUPER_HAS_ALLOC_INODE
-                LINUX_FS_STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK
-                LINUX_FS_STRUCT_ADDRESS_SPACE_HAS_GFP_MASK
-                LINUX_FS_STRUCT_INODE_HAS_I_ALLOC_SEM
-                LINUX_FS_STRUCT_INODE_HAS_I_BLKBITS
-                LINUX_FS_STRUCT_INODE_HAS_I_BLKSIZE
-                LINUX_FS_STRUCT_INODE_HAS_I_TRUNCATE_SEM
-                LINUX_FS_STRUCT_INODE_HAS_I_DIRTY_DATA_BUFFERS
-                LINUX_FS_STRUCT_INODE_HAS_I_DEVICES
-                LINUX_FS_STRUCT_INODE_HAS_I_MMAP_SHARED
-                LINUX_FS_STRUCT_INODE_HAS_I_MUTEX
-                LINUX_FS_STRUCT_INODE_HAS_I_SB_LIST
-                LINUX_FS_STRUCT_INODE_HAS_I_SECURITY
-                LINUX_FS_STRUCT_INODE_HAS_INOTIFY_LOCK
-                LINUX_FS_STRUCT_INODE_HAS_INOTIFY_SEM
-                LINUX_INODE_SETATTR_RETURN_TYPE
-                LINUX_WRITE_INODE_RETURN_TYPE
-                LINUX_IOP_I_CREATE_TAKES_NAMEIDATA
-                LINUX_IOP_I_LOOKUP_TAKES_NAMEIDATA
+                LINUX_INODE_SETATTR_RETURN_TYPE
+                LINUX_IOP_I_CREATE_TAKES_NAMEIDATA
+                LINUX_IOP_I_LOOKUP_TAKES_NAMEIDATA
                 LINUX_IOP_I_PERMISSION_TAKES_NAMEIDATA
                 LINUX_IOP_I_PUT_LINK_TAKES_COOKIE
                 LINUX_DOP_D_REVALIDATE_TAKES_NAMEIDATA
                 LINUX_FOP_F_FLUSH_TAKES_FL_OWNER_T
                 LINUX_AOP_WRITEBACK_CONTROL
-                LINUX_FS_STRUCT_FOP_HAS_FLOCK
-                LINUX_FS_STRUCT_FOP_HAS_SENDFILE
                 LINUX_FS_STRUCT_FOP_HAS_SPLICE
-                LINUX_KERNEL_LINUX_SYSCALL_H
-                LINUX_KERNEL_LINUX_SEQ_FILE_H
                 LINUX_KERNEL_POSIX_LOCK_FILE_WAIT_ARG
-                LINUX_KERNEL_SELINUX
+                LINUX_POSIX_TEST_LOCK_RETURNS_CONFLICT
+                LINUX_POSIX_TEST_LOCK_CONFLICT_ARG
                 LINUX_KERNEL_SOCK_CREATE
-                LINUX_KERNEL_PAGE_FOLLOW_LINK
-                LINUX_KERNEL_HLIST_UNHASHED
-                 LINUX_KEY_TYPE_H_EXISTS
+                LINUX_EXPORTS_KEY_TYPE_KEYRING
+                LINUX_KEYS_HAVE_SESSION_TO_PARENT
                 LINUX_NEED_RHCONFIG
                 LINUX_RECALC_SIGPENDING_ARG_TYPE
-                LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_PARENT
-                LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_REAL_PARENT
-                LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_SIG
-                LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_SIGHAND
-                LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_SIGMASK_LOCK
-                LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_RLIM
-                LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_SIGNAL_RLIM
-                LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_EXIT_STATE
-                LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_TGID
-                LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_TODO
-                LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_THREAD_INFO
                 LINUX_EXPORTS_TASKLIST_LOCK
                 LINUX_GET_SB_HAS_STRUCT_VFSMOUNT
                 LINUX_STATFS_TAKES_DENTRY
-                LINUX_FREEZER_H_EXISTS
-                LINUX_HAVE_SVC_ADDR_IN
-                if test "x$ac_cv_linux_freezer_h_exists" = "xyes" ; then
-                 AC_DEFINE(FREEZER_H_EXISTS, 1, [define if you have linux/freezer.h])
-                fi
                 LINUX_REFRIGERATOR
+                LINUX_HAVE_TRY_TO_FREEZE
                 LINUX_LINUX_KEYRING_SUPPORT
                 LINUX_KEY_ALLOC_NEEDS_STRUCT_TASK
-                LINUX_DO_SYNC_READ
-                LINUX_GENERIC_FILE_AIO_READ
+                LINUX_KEY_ALLOC_NEEDS_CRED
                 LINUX_INIT_WORK_HAS_DATA
                 LINUX_REGISTER_SYSCTL_TABLE_NOFLAG
                 LINUX_SYSCTL_TABLE_CHECKING
-                LINUX_HAVE_IGET
-                LINUX_HAVE_I_SIZE_READ
-                LINUX_FS_STRUCT_NAMEIDATA_HAS_PATH
                 LINUX_EXPORTS_INIT_MM
                  LINUX_EXPORTS_SYS_CHDIR
-                 LINUX_EXPORTS_SYS_CLOSE
                  LINUX_EXPORTS_SYS_OPEN
-                 LINUX_EXPORTS_SYS_WAIT4
-                LINUX_EXPORTS_RCU_READ_LOCK
+
+                dnl Packaging and SMP build
                 if test "x$with_linux_kernel_packaging" = "xno" ; then
                   LINUX_WHICH_MODULES
                 else
                   AC_SUBST(MPS,'SP')
                 fi
+
+                dnl Syscall probing
                  if test "x$ac_cv_linux_config_modversions" = "xno" -o $AFS_SYSKVERS -ge 26; then
                    AC_MSG_WARN([Cannot determine sys_call_table status. assuming it isn't exported])
                    ac_cv_linux_exports_sys_call_table=no
@@ -961,272 +982,15 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 if test -f "$LINUX_KERNEL_PATH/include/linux/mm_inline.h"; then
                  AC_DEFINE(HAVE_MM_INLINE_H, 1, [define if you have mm_inline.h header file])
                 fi
-                if test -f "$LINUX_KERNEL_PATH/include/linux/in_systm.h"; then
-                 AC_DEFINE(HAVE_IN_SYSTM_H, 1, [define if you have in_systm.h header file])
-                fi
-                if test "x$ac_cv_linux_exports_sys_chdir" = "xyes" ; then
-                 AC_DEFINE(EXPORTED_SYS_CHDIR, 1, [define if your linux kernel exports sys_chdir])
-                fi
-                if test "x$ac_cv_linux_exports_sys_open" = "xyes" ; then
-                 AC_DEFINE(EXPORTED_SYS_OPEN, 1, [define if your linux kernel exports sys_open])
-                fi
-                if test "x$ac_cv_linux_exports_sys_close" = "xyes" ; then
-                 AC_DEFINE(EXPORTED_SYS_CLOSE, 1, [define if your linux kernel exports sys_close])
-                fi
-                if test "x$ac_cv_linux_exports_sys_wait4" = "xyes" ; then
-                 AC_DEFINE(EXPORTED_SYS_WAIT4, 1, [define if your linux kernel exports sys_wait4])
-                fi
-                 if test "x$ac_cv_linux_exports_sys_call_table" = "xyes"; then
-                  AC_DEFINE(EXPORTED_SYS_CALL_TABLE, 1, [define if your linux kernel exports sys_call_table])
-                 fi
-                 if test "x$ac_cv_linux_exports_ia32_sys_call_table" = "xyes"; then
-                  AC_DEFINE(EXPORTED_IA32_SYS_CALL_TABLE, 1, [define if your linux kernel exports ia32_sys_call_table])
-                 fi
-                 if test "x$ac_cv_linux_exports_kallsyms_symbol" = "xyes"; then
-                  AC_DEFINE(EXPORTED_KALLSYMS_SYMBOL, 1, [define if your linux kernel exports kallsyms])
-                 fi
-                 if test "x$ac_cv_linux_exports_kallsyms_address" = "xyes"; then
-                  AC_DEFINE(EXPORTED_KALLSYMS_ADDRESS, 1, [define if your linux kernel exports kallsyms address])
-                 fi
-                if test "x$ac_cv_linux_completion_h_exists" = "xyes" ; then
-                 AC_DEFINE(COMPLETION_H_EXISTS, 1, [define if completion_h exists])
-                fi
-                if test "x$ac_cv_linux_config_h_exists" = "xyes" ; then
-                 AC_DEFINE(CONFIG_H_EXISTS, 1, [define if config.h exists])
-                fi
-                if test "x$ac_cv_linux_exportfs_h_exists" = "xyes"; then
-                 AC_DEFINE(EXPORTFS_H_EXISTS, 1, [define if linux/exportfs.h exists])
-                fi
-                if test "x$ac_cv_linux_key_type_h_exists" = "xyes" ; then
-                 AC_DEFINE(KEY_TYPE_H_EXISTS, 1, [define if key-type.h exists])
-                fi
-                if test "x$ac_cv_linux_defines_for_each_process" = "xyes" ; then
-                 AC_DEFINE(DEFINED_FOR_EACH_PROCESS, 1, [define if for_each_process defined])
-                fi
-                if test "x$ac_cv_linux_defines_prev_task" = "xyes" ; then
-                 AC_DEFINE(DEFINED_PREV_TASK, 1, [define if prev_task defined])
-                fi
-                if test "x$ac_cv_linux_func_inode_setattr_returns_int" = "xyes" ; then
-                 AC_DEFINE(INODE_SETATTR_NOT_VOID, 1, [define if your setattr return return non-void])
-                fi
-                if test "x$ac_cv_linux_func_write_inode_returns_int" = "xyes" ; then
-                 AC_DEFINE(WRITE_INODE_NOT_VOID, 1, [define if your sops.write_inode returns non-void])
-                fi
-                if test "x$ac_cv_linux_fs_struct_super_has_alloc_inode" = "xyes" ; then
-                 AC_DEFINE(STRUCT_SUPER_HAS_ALLOC_INODE, 1, [define if your struct super_operations has alloc_inode])
-                fi
-                if test "x$ac_cv_linux_fs_struct_address_space_has_page_lock" = "xyes"; then 
-                 AC_DEFINE(STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK, 1, [define if your struct address_space has page_lock])
-                fi
-                if test "x$ac_cv_linux_fs_struct_address_space_has_gfp_mask" = "xyes"; then 
-                 AC_DEFINE(STRUCT_ADDRESS_SPACE_HAS_GFP_MASK, 1, [define if your struct address_space has gfp_mask])
-                fi
-                if test "x$ac_cv_linux_fs_struct_inode_has_i_truncate_sem" = "xyes"; then 
-                 AC_DEFINE(STRUCT_INODE_HAS_I_TRUNCATE_SEM, 1, [define if your struct inode has truncate_sem])
-                fi
-                if test "x$ac_cv_linux_fs_struct_inode_has_i_alloc_sem" = "xyes"; then 
-                 AC_DEFINE(STRUCT_INODE_HAS_I_ALLOC_SEM, 1, [define if your struct inode has alloc_sem])
-                fi
-                if test "x$ac_cv_linux_fs_struct_inode_has_i_blksize" = "xyes"; then 
-                 AC_DEFINE(STRUCT_INODE_HAS_I_BLKSIZE, 1, [define if your struct inode has i_blksize])
-                fi
-                if test "x$ac_cv_linux_fs_struct_inode_has_i_devices" = "xyes"; then 
-                 AC_DEFINE(STRUCT_INODE_HAS_I_DEVICES, 1, [define if you struct inode has i_devices])
-                fi
-                if test "x$ac_cv_linux_fs_struct_inode_has_i_security" = "xyes"; then 
-                 AC_DEFINE(STRUCT_INODE_HAS_I_SECURITY, 1, [define if you struct inode has i_security])
-                fi
-                if test "x$ac_cv_linux_fs_struct_inode_has_i_mutex" = "xyes"; then 
-                 AC_DEFINE(STRUCT_INODE_HAS_I_MUTEX, 1, [define if you struct inode has i_mutex])
-                fi
-                if test "x$ac_cv_linux_fs_struct_inode_has_i_sb_list" = "xyes"; then 
-                 AC_DEFINE(STRUCT_INODE_HAS_I_SB_LIST, 1, [define if you struct inode has i_sb_list])
-                fi
-                if test "x$ac_cv_linux_fs_struct_inode_has_i_dirty_data_buffers" = "xyes"; then 
-                 AC_DEFINE(STRUCT_INODE_HAS_I_DIRTY_DATA_BUFFERS, 1, [define if your struct inode has data_buffers])
-                fi
-                if test "x$ac_cv_linux_fs_struct_inode_has_inotify_lock" = "xyes"; then 
-                 AC_DEFINE(STRUCT_INODE_HAS_INOTIFY_LOCK, 1, [define if your struct inode has inotify_lock])
-                fi
-                if test "x$ac_cv_linux_fs_struct_inode_has_inotify_sem" = "xyes"; then 
-                 AC_DEFINE(STRUCT_INODE_HAS_INOTIFY_SEM, 1, [define if your struct inode has inotify_sem])
-                fi
-                if test "x$ac_cv_linux_func_recalc_sigpending_takes_void" = "xyes"; then 
-                 AC_DEFINE(RECALC_SIGPENDING_TAKES_VOID, 1, [define if your recalc_sigpending takes void])
-                fi
-                if test "x$ac_cv_linux_kernel_posix_lock_file_wait_arg" = "xyes" ; then
-                 AC_DEFINE(POSIX_LOCK_FILE_WAIT_ARG, 1, [define if your linux kernel uses 3 arguments for posix_lock_file])
-                fi
-                if test "x$ac_cv_linux_kernel_is_selinux" = "xyes" ; then
-                 AC_DEFINE(LINUX_KERNEL_IS_SELINUX, 1, [define if your linux kernel uses SELinux features])
-                fi
-                if test "x$ac_cv_linux_kernel_sock_create_v" = "xyes" ; then
-                 AC_DEFINE(LINUX_KERNEL_SOCK_CREATE_V, 1, [define if your linux kernel uses 5 arguments for sock_create])
-                fi
-                if test "x$ac_cv_linux_kernel_page_follow_link" = "xyes" ; then
-                 AC_DEFINE(HAVE_KERNEL_PAGE_FOLLOW_LINK, 1, [define if your linux kernel provides page_follow_link])
-                fi
-                if test "x$ac_cv_linux_kernel_hlist_unhashed" = "xyes" ; then
-                 AC_DEFINE(HAVE_KERNEL_HLIST_UNHASHED, 1, [define if your linux kernel provides hlist_unhashed])
-                fi
-                if test "x$ac_linux_syscall" = "xyes" ; then
-                 AC_DEFINE(HAVE_KERNEL_LINUX_SYSCALL_H, 1, [define if your linux kernel has linux/syscall.h])
-                fi
-                if test "x$ac_linux_seq_file" = "xyes" ; then
-                 AC_DEFINE(HAVE_KERNEL_LINUX_SEQ_FILE_H, 1, [define if your linux kernel has linux/seq_file.h])
-                fi
-                if test "x$ac_cv_linux_sched_struct_task_struct_has_parent" = "xyes"; then 
-                 AC_DEFINE(STRUCT_TASK_STRUCT_HAS_PARENT, 1, [define if your struct task_struct has parent])
-                fi
-                if test "x$ac_cv_linux_sched_struct_task_struct_has_real_parent" = "xyes"; then 
-                 AC_DEFINE(STRUCT_TASK_STRUCT_HAS_REAL_PARENT, 1, [define if your struct task_struct has real_parent])
-                fi
-                if test "x$ac_cv_linux_sched_struct_task_struct_has_sigmask_lock" = "xyes"; then 
-                 AC_DEFINE(STRUCT_TASK_STRUCT_HAS_SIGMASK_LOCK, 1, [define if your struct task_struct has sigmask_lock])
-                fi
-                if test "x$ac_cv_linux_sched_struct_task_struct_has_sighand" = "xyes"; then 
-                 AC_DEFINE(STRUCT_TASK_STRUCT_HAS_SIGHAND, 1, [define if your struct task_struct has sighand])
-                fi
-                if test "x$ac_cv_linux_sched_struct_task_struct_has_sig" = "xyes"; then 
-                 AC_DEFINE(STRUCT_TASK_STRUCT_HAS_SIG, 1, [define if your struct task_struct has sig])
-                fi
-                if test "x$ac_cv_linux_sched_struct_task_struct_has_rlim" = "xyes"; then 
-                 AC_DEFINE(STRUCT_TASK_STRUCT_HAS_RLIM, 1, [define if your struct task_struct has rlim])
-                fi
-                if test "x$ac_cv_linux_sched_struct_task_struct_has_signal_rlim" = "xyes"; then 
-                 AC_DEFINE(STRUCT_TASK_STRUCT_HAS_SIGNAL_RLIM, 1, [define if your struct task_struct has signal->rlim])
-                fi
-                if test "x$ac_cv_linux_sched_struct_task_struct_has_exit_state" = "xyes"; then 
-                 AC_DEFINE(STRUCT_TASK_STRUCT_HAS_EXIT_STATE, 1, [define if your struct task_struct has exit_state])
-                fi
-                if test "x$ac_cv_linux_sched_struct_task_struct_has_tgid" = "xyes"; then 
-                 AC_DEFINE(STRUCT_TASK_STRUCT_HAS_TGID, 1, [define if your struct task_struct has tgid])
-                fi
-                if test "x$ac_cv_linux_sched_struct_task_struct_has_todo" = "xyes"; then 
-                 AC_DEFINE(STRUCT_TASK_STRUCT_HAS_TODO, 1, [define if your struct task_struct has todo])
-                fi
-                if test "x$ac_cv_linux_sched_struct_task_struct_has_thread_info" = "xyes"; then 
-                 AC_DEFINE(STRUCT_TASK_STRUCT_HAS_THREAD_INFO, 1, [define if your struct task_struct has thread_info])
-                fi
-                if test "x$ac_cv_linux_get_sb_has_struct_vfsmount" = "xyes"; then
-                 AC_DEFINE(GET_SB_HAS_STRUCT_VFSMOUNT, 1, [define if your get_sb_nodev needs a struct vfsmount argument])
-                fi
-                if test "x$ac_cv_linux_statfs_takes_dentry" = "xyes"; then
-                 AC_DEFINE(STATFS_TAKES_DENTRY, 1, [define if your statfs takes a dentry argument])
-                fi
-                if test "x$ac_cv_linux_func_a_writepage_takes_writeback_control" = "xyes" ; then
-                 AC_DEFINE(AOP_WRITEPAGE_TAKES_WRITEBACK_CONTROL, 1, [define if your aops.writepage takes a struct writeback_control argument])
-                fi
-                if test "x$ac_cv_linux_func_refrigerator_takes_pf_freeze" = "xyes" ; then
-                 AC_DEFINE(LINUX_REFRIGERATOR_TAKES_PF_FREEZE, 1, [define if your refrigerator takes PF_FREEZE])
-                fi
-                if test "x$ac_cv_linux_func_i_create_takes_nameidata" = "xyes" ; then
-                 AC_DEFINE(IOP_CREATE_TAKES_NAMEIDATA, 1, [define if your iops.create takes a nameidata argument])
-                fi
-                if test "x$ac_cv_linux_func_f_flush_takes_fl_owner_t" = "xyes" ; then
-                 AC_DEFINE(FOP_FLUSH_TAKES_FL_OWNER_T, 1, [define if your fops.flush takes an fl_owner_t argument])
-                fi
-                if test "x$ac_cv_linux_func_i_lookup_takes_nameidata" = "xyes" ; then
-                 AC_DEFINE(IOP_LOOKUP_TAKES_NAMEIDATA, 1, [define if your iops.lookup takes a nameidata argument])
-                fi
-                if test "x$ac_cv_linux_func_i_permission_takes_nameidata" = "xyes" ; then
-                 AC_DEFINE(IOP_PERMISSION_TAKES_NAMEIDATA, 1, [define if your iops.permission takes a nameidata argument])
-                fi
-                if test "x$ac_cv_linux_func_d_revalidate_takes_nameidata" = "xyes" ; then
-                 AC_DEFINE(DOP_REVALIDATE_TAKES_NAMEIDATA, 1, [define if your dops.d_revalidate takes a nameidata argument])
-                fi
-                if test "x$ac_cv_linux_init_work_has_data" = "xyes" ; then
-                 AC_DEFINE(INIT_WORK_HAS_DATA, 1, [define if INIT_WORK takes a data (3rd) argument])
-                fi
-                if test "x$ac_cv_linux_fs_struct_fop_has_flock" = "xyes" ; then
-                 AC_DEFINE(STRUCT_FILE_OPERATIONS_HAS_FLOCK, 1, [define if your struct file_operations has flock])
-                fi
-                if test "x$ac_cv_linux_fs_struct_fop_has_sendfile" = "xyes" ; then
-                 AC_DEFINE(STRUCT_FILE_OPERATIONS_HAS_SENDFILE, 1, [define if your struct file_operations has sendfile])
-                fi
-                if test "x$ac_cv_linux_fs_struct_fop_has_splice" = "xyes" ; then
-                 AC_DEFINE(STRUCT_FILE_OPERATIONS_HAS_SPLICE, 1, [define if your struct file_operations has splice_write and splice_read])
-                fi
-                if test "x$ac_cv_linux_register_sysctl_table_noflag" = "xyes" ; then
-                 AC_DEFINE(REGISTER_SYSCTL_TABLE_NOFLAG, 1, [define if register_sysctl_table has no insert_at head flag])
-                fi
-                if test "x$ac_cv_linux_sysctl_table_checking" = "xyes" ; then
-                 AC_DEFINE(SYSCTL_TABLE_CHECKING, 1, [define if your kernel has sysctl table checking])
-                fi
-                if test "x$ac_cv_linux_have_iget" = "xyes" ; then
-                 AC_DEFINE(HAVE_IGET, 1, [define if your kernel has iget])
-                fi
-                if test "x$ac_cv_linux_struct_nameidata_has_path" = "xyes" ; then
-                 AC_DEFINE(STRUCT_NAMEIDATA_HAS_PATH, 1, [define if your struct nameidata has path])
-                fi
-                if test "x$ac_cv_linux_exports_init_mm" = "xyes" ; then
-                 AC_DEFINE(EXPORTED_INIT_MM, 1, [define if your kernel exports init_mm])
-                fi
-                if test "x$ac_cv_linux_exports_tasklist_lock" = "xyes" ; then
-                 AC_DEFINE(EXPORTED_TASKLIST_LOCK, 1, [define if tasklist_lock exported])
-                fi
-                if test "x$ac_cv_linux_have_kmem_cache_t" = "xyes" ; then
-                 AC_DEFINE(HAVE_KMEM_CACHE_T, 1, [define if kmem_cache_t exists])
-                fi
-                if test "x$ac_cv_linux_kmem_cache_init" = "xyes" ; then
-                 AC_DEFINE(KMEM_CACHE_INIT, 1, [define for new kmem_cache init function parameters])
-                fi
-                if test "x$ac_cv_linux_have_current_kernel_time" = "xyes" ; then
-                 AC_DEFINE(HAVE_CURRENT_KERNEL_TIME, 1, [define if current_kernel_time() exists])
-                fi
-                if test "x$ac_cv_linux_have_kmem_cache_t" = "xyes" ; then
-                 AC_DEFINE(KMEM_CACHE_TAKES_DTOR, 1, [define if kmem_cache_create takes a destructor argument])
-                fi
-                if test "$enable_linux_fh" = "yes"; then
-                 AC_DEFINE(LINUX_USE_FH, 1, [define if you want to open cache files by file handle instead of inode numbers])
-                fi
                 if test "x$ac_cv_linux_kernel_page_follow_link" = "xyes" -o "x$ac_cv_linux_func_i_put_link_takes_cookie" = "xyes"; then
                  AC_DEFINE(USABLE_KERNEL_PAGE_SYMLINK_CACHE, 1, [define if your kernel has a usable symlink cache API])
                 else
                  AC_MSG_WARN([your kernel does not have a usable symlink cache API])
                 fi
-                if test "x$ac_cv_linux_have_svc_addr_in" = "xyes"; then
-                 AC_DEFINE(HAVE_SVC_ADDR_IN, 1, [define if svc_add_in exists])
-                 fi
                 :
                fi
 esac
 
-case $AFS_SYSNAME in
-       *_darwin*)
-               DARWIN_PLIST=src/libafs/afs.${AFS_SYSNAME}.plist
-               DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist
-                dnl the test below fails on darwin, even if the CPPFLAGS below
-                dnl are added. the headers from Kernel.framework must be used
-                dnl when KERNEL is defined.
-
-                dnl really, such a thing isn't guaranteed to work on any 
-                dnl platform until the kernel cflags from MakefileProto are
-                dnl known to configure
-               AC_DEFINE(HAVE_STRUCT_BUF, 1, [define if you have a struct buf])
-               ;;
-        *)
-AC_MSG_CHECKING(for definition of struct buf)
-dnl save_CPPFLAGS="$CPPFLAGS"
-dnl CPPFLAGS="$CPPFLAGS -DKERNEL -D_KERNEL -D__KERNEL -D__KERNEL__"
-AC_CACHE_VAL(ac_cv_have_struct_buf, [
-       ac_cv_have_struct_buf=no
-       AC_TRY_COMPILE(
-               [#include <sys/buf.h>],
-               [struct buf x;
-               printf("%d\n", sizeof(x));],
-               ac_cv_have_struct_buf=yes,)
-       ]
-)
-dnl CPPFLAGS="$save_CPPFLAGS"
-AC_MSG_RESULT($ac_cv_have_struct_buf)
-if test "$ac_cv_have_struct_buf" = yes; then
-       AC_DEFINE(HAVE_STRUCT_BUF, 1, [define if you have a struct buf])
-fi
-;;
-esac
-
-
 AC_CACHE_VAL(ac_cv_sockaddr_len,
 [
 AC_MSG_CHECKING([if struct sockaddr has sa_len field])
@@ -1241,34 +1005,9 @@ fi
 if test "x${MKAFS_OSTYPE}" = "xIRIX"; then
         echo Skipping library tests because they confuse Irix.
 else
-  AC_CHECK_FUNCS(socket)
-
-  if test "$ac_cv_func_socket" = no; then
-    for lib in socket inet; do
-        if test "$HAVE_SOCKET" != 1; then
-                AC_CHECK_LIB(${lib}, socket,LIBS="$LIBS -l$lib";HAVE_SOCKET=1;AC_DEFINE(HAVE_SOCKET, 1, [define if you have socket]))
-        fi
-    done
-  fi
-  
-  AC_CHECK_FUNCS(connect)       
-
-  if test "$ac_cv_func_connect" = no; then
-    for lib in nsl; do
-        if test "$HAVE_CONNECT" != 1; then
-                AC_CHECK_LIB(${lib}, connect,LIBS="$LIBS -l$lib";HAVE_CONNECT=1;AC_DEFINE(HAVE_CONNECT, 1, [define if you have connect]))
-        fi
-    done
-  fi
-
-  AC_CHECK_FUNCS(gethostbyname)
-  if test "$ac_cv_func_gethostbyname" = no; then
-        for lib in dns nsl resolv; do
-          if test "$HAVE_GETHOSTBYNAME" != 1; then
-            AC_CHECK_LIB(${lib}, gethostbyname, LIBS="$LIBS -l$lib";HAVE_GETHOSTBYNAME=1;AC_DEFINE(HAVE_GETHOSTBYNAME, 1, [define if you have gethostbyname]))
-          fi
-        done    
-  fi    
+  AC_SEARCH_LIBS([socket], [socket inet])
+  AC_SEARCH_LIBS([connect], [nsl])
+  AC_SEARCH_LIBS([gethostbyname], [dns nsl resolv])
 
   dnl darwin wants it, aix hates it
   AC_MSG_CHECKING(for the useability of arpa/nameser_compat.h)
@@ -1301,7 +1040,7 @@ else
         fi
       done    
       if test "$ac_cv_func_res_search" = yes; then
-        LIB_res_search="-l$lib"       
+        LIB_AFSDB="-l$lib"
        AC_DEFINE(HAVE_RES_SEARCH, 1, [])
         AC_MSG_RESULT([yes, in lib$lib])
       else
@@ -1314,6 +1053,8 @@ else
   
 fi
 
+AC_CHECK_RESOLV_RETRANS
+
 AC_CACHE_VAL(ac_cv_setsockopt_iprecverr,
 [
 AC_MSG_CHECKING([for setsockopt(, SOL_IP, IP_RECVERR)])
@@ -1331,6 +1072,9 @@ PTHREAD_LIBS=error
 if test "x$MKAFS_OSTYPE" = OBSD; then
         PTHREAD_LIBS="-pthread"
 fi
+if test "x$MKAFS_OSTYPE" = xDFBSD; then
+        PTHREAD_LIBS="-pthread"
+fi
 if test "x$PTHREAD_LIBS" = xerror; then
         AC_CHECK_LIB(pthread, pthread_attr_init,
                 PTHREAD_LIBS="-lpthread")
@@ -1416,56 +1160,41 @@ if test "$enable_fast_restart" = "yes" &&
        exit 1
 fi
 
-if test "$enable_full_vos_listvol_switch" = "yes"; then
-       AC_DEFINE(FULL_LISTVOL_SWITCH, 1, [define if you want to want listvol switch])
-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_bos_restricted_mode" = "yes"; then
-       AC_DEFINE(BOS_RESTRICTED_MODE, 1, [define if you want to want bos restricted mode])
-fi
-
-if test "$enable_bos_new_config" = "yes"; then
-       AC_DEFINE(BOS_NEW_CONFIG, 1, [define if you want to enable automatic renaming of BosConfig.new to BosConfig at startup])
-fi
-
-if test "$enable_largefile_fileserver" = "yes"; then
-       AC_DEFINE(AFS_LARGEFILE_ENV, 1, [define if you want large file fileserver])
-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=""
 else
        if test "$enable_namei_fileserver" = "default"; then
                case $host in
                        *-solaris2.10*)
                                AC_MSG_WARN(Some Solaris 10 versions are not safe with the inode fileserver. Forcing namei. Override with --disable-namei-fileserver)
                                AC_DEFINE(AFS_NAMEI_ENV, 1, [define if you want to want namei fileserver])
+                               VFSCK=""
                                ;;
                        *-solaris2.11*)
                                AC_MSG_WARN(Solaris 11 versions are not safe with the inode fileserver. Forcing namei. Override with --disable-namei-fileserver)
                                AC_DEFINE(AFS_NAMEI_ENV, 1, [define if you want to want namei fileserver])
+                               VFSCK=""
                                ;;
                        *)
+                               VFSCK="vfsck"
                                ;;
                esac
+        else
+               VFSCK="vfsck"
        fi
 fi
 
-if test "$enable_afsdb" = "yes"; then
-       LIB_AFSDB="$LIB_res_search"
-       AC_DEFINE(AFS_AFSDB_ENV, 1, [define if you want to want search afsdb rr])
-fi
-
 dnl check for tivoli
 AC_MSG_CHECKING(for tivoli tsm butc support)
 XBSA_CFLAGS=""
@@ -1504,13 +1233,29 @@ dnl checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_HEADER_DIRENT
-AC_CHECK_HEADERS(stdlib.h string.h unistd.h poll.h fcntl.h sys/time.h sys/file.h)
+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 poll.h)
-AC_CHECK_HEADERS(windows.h malloc.h winsock2.h direct.h io.h sys/user.h)
-AC_CHECK_HEADERS(security/pam_modules.h siad.h usersec.h ucontext.h regex.h values.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(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)
+
+AC_CHECK_TYPES([fsblkcnt_t],,,[
+#include <sys/types.h>
+#ifdef HAVE_SYS_BITYPES_H
+#include <sys/bitypes.h>
+#endif
+#ifdef HAVE_SYS_STATFS_H
+#include <sys/statfs.h>
+#endif
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
+])
+
+OPENAFS_TEST_PACKAGE(libintl,[#include <libintl.h>],[-lintl],,,INTL)
 
 dnl Don't build PAM on IRIX; the interface doesn't work for us.
 if test "$ac_cv_header_security_pam_modules_h" = yes -a "$enable_pam" = yes; then
@@ -1534,10 +1279,9 @@ else
 fi
 AC_SUBST(BUILD_LOGIN)
 
-AC_CHECK_FUNCS(utimes random srandom getdtablesize snprintf strlcat strlcpy re_comp re_exec flock)
+AC_CHECK_FUNCS(snprintf strlcat strlcpy flock)
 AC_CHECK_FUNCS(setprogname getprogname sigaction mkstemp vsnprintf strerror strcasestr)
-AC_CHECK_FUNCS(setvbuf vsyslog)
-AC_FUNC_SETVBUF_REVERSED
+AC_CHECK_FUNCS(setvbuf vsyslog getcwd)
 AC_CHECK_FUNCS(regcomp regexec regerror)
 AC_MSG_CHECKING([for POSIX regex library])
 if test "$ac_cv_header_regex_h" = "yes" && \
@@ -1550,7 +1294,14 @@ else
     AC_MSG_RESULT(no)
 fi
 
+AC_TYPE_SOCKLEN_T
 AC_TYPE_SIGNAL
+AC_CHECK_SIZEOF(void *)
+AC_CHECK_SIZEOF(unsigned long long)
+AC_CHECK_SIZEOF(unsigned long)
+AC_CHECK_SIZEOF(unsigned int)
+AC_TYPE_INTPTR_T
+AC_TYPE_UINTPTR_T
 AC_CHECK_TYPE(ssize_t, int)
 AC_CHECK_TYPE([sig_atomic_t], ,
     [AC_DEFINE([sig_atomic_t], [int],
@@ -1559,6 +1310,8 @@ AC_CHECK_TYPE([sig_atomic_t], ,
 #include <signal.h>])
 AC_SIZEOF_TYPE(long)
 
+AC_HEADER_PAM_CONST
+
 AC_CHECK_FUNCS(timegm)
 AC_CHECK_FUNCS(daemon)
 
@@ -1575,6 +1328,7 @@ if test "x$enable_transarc_paths" = "xyes"  ; then
     afslocaldir=${afslocaldir=/usr/afs/local}
     afsbackupdir=${afsbackupdir=/usr/afs/backup}
     afsbosconfigdir=${afsbosconfigdir=/usr/afs/local}
+    afsdatadir=${afsdatadir=/usr/vice/etc}
 else 
     afsconfdir=${afsconfdir='${sysconfdir}/openafs/server'}
     viceetcdir=${viceetcdir='${sysconfdir}/openafs'}
@@ -1587,6 +1341,7 @@ else
     afslocaldir=${afslocaldir='${localstatedir}/openafs'}
     afsbackupdir=${afsbackupdir='${localstatedir}/openafs/backup'}
     afsbosconfigdir=${afsbosconfigdir='${sysconfdir}/openafs'}
+    afsdatadir=${afsdatadir='${datadir}/openafs'}
 fi
 AC_SUBST(afsconfdir)
 AC_SUBST(viceetcdir)
@@ -1599,6 +1354,7 @@ AC_SUBST(afslogsdir)
 AC_SUBST(afslocaldir)
 AC_SUBST(afsbackupdir)
 AC_SUBST(afsbosconfigdir)
+AC_SUBST(afsdatadir)
 
 if test "x$enable_kernel_module" = "xyes"; then
 ENABLE_KERNEL_MODULE=libafs
@@ -1608,6 +1364,7 @@ if test "x$enable_pthreaded_ubik" = "xyes"; then
 ENABLE_PTHREADED_UBIK=yes
 fi
 
+AC_SUBST(VFSCK)
 AC_SUBST(AFS_SYSNAME)
 AC_SUBST(AFS_PARAM_COMMON)
 AC_SUBST(ENABLE_KERNEL_MODULE)
@@ -1627,9 +1384,12 @@ AC_SUBST(TOP_LIBDIR)
 AC_SUBST(DEST)
 AC_SUBST(DARWIN_INFOFILE)
 AC_SUBST(IRIX_BUILD_IP35)
+AC_SUBST(HTML_XSL)
+AC_SUBST(XSLTPROC)
 
 OPENAFS_OSCONF
 OPENAFS_KRB5CONF
+OPENAFS_FUSE
 
 TOP_SRCDIR="${srcdir}/src"
 dnl