DEVEL15-cvsignore-happiness-20060801
[openafs.git] / acinclude.m4
index 7876de6..f787cef 100644 (file)
@@ -14,11 +14,9 @@ AC_ARG_WITH(afs-sysname,
 [  --with-afs-sysname=sys    use sys for the afs sysname]
 )
 AC_ARG_ENABLE( obsolete,
-[  --enable-obsolete                   enable obsolete portions of AFS (mpp, ntp and package)],, enable_obsolete="no")
-AC_ARG_ENABLE( insecure,
-[  --enable-insecure                   enable insecure portions of AFS (ftpd, inetd, rcp, rlogind and rsh)],, enable_insecure="no")
+[  --enable-obsolete                   enable obsolete portions of AFS (mpp and package)],, enable_obsolete="no")
 AC_ARG_ENABLE( afsdb,
-[  --disable-afsdb                     disable AFSDB RR support],, enable_afsdb="yes")
+[  --disable-afsdb                     disable AFSDB DNS RR support],, enable_afsdb="yes")
 AC_ARG_ENABLE( pam,
 [  --disable-pam                       disable PAM support],, enable_pam="yes")
 AC_ARG_ENABLE( bos-restricted-mode,
@@ -26,7 +24,7 @@ AC_ARG_ENABLE( bos-restricted-mode,
 AC_ARG_ENABLE( bos-new-config,
 [  --enable-bos-new-config             enable bosserver pickup of BosConfig.new on restarts],, enable_bos_new_config="no")
 AC_ARG_ENABLE( largefile-fileserver,
-[  --enable-largefile-fileserver        enable large file support in fileserver],, enable_largefile_fileserver="no")
+[  --disable-largefile-fileserver       disable large file support in fileserver],, enable_largefile_fileserver="yes")
 AC_ARG_ENABLE( namei-fileserver,
 [  --enable-namei-fileserver           force compilation of namei fileserver in preference to inode fileserver],, enable_namei_fileserver="no")
 AC_ARG_ENABLE( supergroups,
@@ -35,13 +33,15 @@ AC_ARG_ENABLE( fast-restart,
 [  --enable-fast-restart               enable fast startup of file server without salvaging],, enable_fast_restart="no")
 AC_ARG_ENABLE( bitmap-later,
 [  --enable-bitmap-later               enable fast startup of file server by not reading bitmap till needed],, enable_bitmap_later="no")
+AC_ARG_ENABLE( demand-attach-fs,
+[  --enable-demand-attach-fs           enable Demand Attach Fileserver (please see documentation)],, enable_demand_attach_fs="no")
 AC_ARG_ENABLE( full-vos-listvol-switch,
 [  --disable-full-vos-listvol-switch    disable vos full listvol switch for formatted output],, enable_full_vos_listvol_switch="yes")
 AC_ARG_WITH(dux-kernel-headers,
 [  --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,
-[  --with-linux-kernel-headers=path            use the kernel headers found at path(optional, defaults to /usr/src/linux)]
+[  --with-linux-kernel-headers=path            use the kernel headers found at path(optional, defaults to /usr/src/linux-2.4, then /usr/src/linux)]
 )
 AC_ARG_WITH(bsd-kernel-headers,
 [  --with-bsd-kernel-headers=path      use the kernel headers found at path(optional, defaults to /usr/src/sys)]
@@ -79,6 +79,13 @@ AC_ARG_ENABLE(debug-lwp,
 AC_ARG_ENABLE(optimize-lwp,
 [  --disable-optimize-lwp              disable optimization for compilation of the LWP code (defaults to enabled)],, enable_optimize_lwp="yes"
 )
+AC_ARG_ENABLE(debug-pam,
+[  --enable-debug-pam                  enable compilation of the PAM code with debugging information (defaults to disabled)],, enable_debug_pam="no"
+)
+AC_ARG_ENABLE(optimize-pam,
+[  --disable-optimize-pam              disable optimization for compilation of the PAM code (defaults to enabled)],, enable_optimize_pam="yes"
+)
+
 
 enable_login="no"
 
@@ -106,6 +113,7 @@ AC_MSG_CHECKING(your OS)
 system=$host
 case $system in
         *-linux*)
+
                MKAFS_OSTYPE=LINUX
                if test "x$enable_redhat_buildsys" = "xyes"; then
                 AC_DEFINE(ENABLE_REDHAT_BUILDSYS, 1, [define if you have redhat buildsystem])
@@ -114,11 +122,21 @@ case $system in
                 if test "x$with_linux_kernel_headers" != "x"; then
                   LINUX_KERNEL_PATH="$with_linux_kernel_headers"
                 else
-                  LINUX_KERNEL_PATH="/usr/src/linux-2.4"
+                  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
                 fi
+               if test -f "$LINUX_KERNEL_PATH/include/linux/utsrelease.h"; then
+                linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_PATH/include/linux/utsrelease.h |awk 'BEGIN { FS="\"" } { print $[]2 }'|tail -n 1`
+                LINUX_VERSION="$linux_kvers"
+               else
                 if test -f "$LINUX_KERNEL_PATH/include/linux/version.h"; then
                  linux_kvers=`fgrep UTS_RELEASE $LINUX_KERNEL_PATH/include/linux/version.h |awk 'BEGIN { FS="\"" } { print $[]2 }'|tail -n 1`
                  if test "x$linux_kvers" = "x"; then
@@ -141,6 +159,7 @@ case $system in
                 else
                     enable_kernel_module="no"
                  fi
+               fi
                 if test ! -f "$LINUX_KERNEL_PATH/include/linux/autoconf.h"; then
                     enable_kernel_module="no"
                 fi
@@ -156,170 +175,12 @@ case $system in
                  SUBARCH=default
                fi
                AC_MSG_RESULT(linux)
-               if test "x$enable_kernel_module" = "xyes"; then
-                if test "x$enable_debug_kernel" = "xno"; then
-                       LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fomit-frame-pointer"
-                fi
-                OPENAFS_GCC_SUPPORTS_MARCH
-                AC_SUBST(P5PLUS_KOPTS)
-                OPENAFS_GCC_NEEDS_NO_STRENGTH_REDUCE
-                OPENAFS_GCC_NEEDS_NO_STRICT_ALIASING
-                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,afs)],
-                  [LINUX_BUILD_VNODE_FROM_INODE(${srcdir}/src/config,src/afs/LINUX,${srcdir}/src/afs/LINUX)]
-                )
-                LINUX_COMPLETION_H_EXISTS
-                LINUX_DEFINES_FOR_EACH_PROCESS
-                LINUX_DEFINES_PREV_TASK
-                LINUX_EXPORTS_TASKLIST_LOCK
-                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_TRUNCATE_SEM
-                LINUX_FS_STRUCT_INODE_HAS_I_DIRTY_DATA_BUFFERS
-                LINUX_FS_STRUCT_INODE_HAS_I_DEVICES
-                LINUX_FS_STRUCT_INODE_HAS_I_SECURITY
-                LINUX_INODE_SETATTR_RETURN_TYPE
-                LINUX_KERNEL_LINUX_SYSCALL_H
-                LINUX_KERNEL_SELINUX
-                LINUX_KERNEL_SOCK_CREATE
-                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_WHICH_MODULES
-                 if test "x$ac_cv_linux_config_modversions" = "xno"; then
-                   AC_MSG_WARN([Cannot determine sys_call_table status. assuming it isn't exported])
-                   ac_cv_linux_exports_sys_call_table=no
-                  if test -f "$LINUX_KERNEL_PATH/include/asm/ia32_unistd.h"; then
-                    ac_cv_linux_exports_ia32_sys_call_table=yes
-                  fi
-                 else
-                   LINUX_EXPORTS_INIT_MM
-                   LINUX_EXPORTS_KALLSYMS_ADDRESS
-                   LINUX_EXPORTS_KALLSYMS_SYMBOL
-                   LINUX_EXPORTS_SYS_CALL_TABLE
-                   LINUX_EXPORTS_IA32_SYS_CALL_TABLE
-                   LINUX_EXPORTS_SYS_CHDIR
-                   LINUX_EXPORTS_SYS_CLOSE
-                   LINUX_EXPORTS_SYS_WAIT4
-                   if test "x$ac_cv_linux_exports_sys_call_table" = "xno"; then
-                         linux_syscall_method=none
-                         if test "x$ac_cv_linux_exports_init_mm" = "xyes"; then
-                            linux_syscall_method=scan
-                            if test "x$ac_cv_linux_exports_kallsyms_address" = "xyes"; then
-                               linux_syscall_method=scan_with_kallsyms_address
-                            fi
-                         fi
-                         if test "x$ac_cv_linux_exports_kallsyms_symbol" = "xyes"; then
-                            linux_syscall_method=kallsyms_symbol
-                         fi
-                         if test "x$linux_syscall_method" = "xnone"; then
-                        AC_MSG_ERROR([no available sys_call_table access method])
-                         fi
-                   fi
-                 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 -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_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_tasklist_lock" = "xyes" ; then
-                 AC_DEFINE(EXPORTED_TASKLIST_LOCK, 1, [define if your linux kernel exports tasklist_lock])
-                fi
-                 if test "x$ac_cv_linux_exports_sys_call_table" = "xyes"; then
-                  AC_DEFINE(EXPORTED_SYS_CALL_TABLE)
-                 fi
-                 if test "x$ac_cv_linux_exports_ia32_sys_call_table" = "xyes"; then
-                  AC_DEFINE(EXPORTED_IA32_SYS_CALL_TABLE)
-                 fi
-                 if test "x$ac_cv_linux_exports_kallsyms_symbol" = "xyes"; then
-                  AC_DEFINE(EXPORTED_KALLSYMS_SYMBOL)
-                 fi
-                 if test "x$ac_cv_linux_exports_kallsyms_address" = "xyes"; then
-                  AC_DEFINE(EXPORTED_KALLSYMS_ADDRESS)
+                if test "x$enable_kernel_module" = "xyes"; then
+                 AFS_SYSKVERS=`echo $LINUX_VERSION | awk -F\. '{print $[]1 $[]2}'`
+                 if test "x${AFS_SYSKVERS}" = "x"; then
+                  AC_MSG_ERROR(Couldn't guess your Linux version [2])
                  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_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_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_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_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_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_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_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_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
-                :
-               fi
+                fi
                 ;;
         *-solaris*)
                MKAFS_OSTYPE=SOLARIS
@@ -336,6 +197,9 @@ case $system in
         *-hpux*)
                MKAFS_OSTYPE=HPUX
                 AC_MSG_RESULT(hp_ux)
+               if test -f "/usr/old/usr/include/ndir.h"; then
+                AC_DEFINE(HAVE_USR_OLD_USR_INCLUDE_NDIR_H, 1, [define if you have old ndir.h])
+               fi
                 ;;
         *-irix*)
                if test -d /usr/include/sys/SN/SN1; then
@@ -363,10 +227,14 @@ case $system in
                fi
                AC_SUBST([HEADER_RT])
                 ;;
-        *-darwin*)
+        powerpc-*-darwin*)
                MKAFS_OSTYPE=DARWIN
                 AC_MSG_RESULT(ppc_darwin)
                 ;;
+        i386-*-darwin*)
+               MKAFS_OSTYPE=DARWIN
+                AC_MSG_RESULT(x86_darwin)
+                ;;
        *-freebsd*)
                MKAFS_OSTYPE=FBSD
                AC_MSG_RESULT(i386_fbsd)
@@ -389,47 +257,23 @@ if test "x$with_afs_sysname" != "x"; then
 else
        AC_MSG_CHECKING(your AFS sysname)
        case $host in
-               i?86-*-openbsd3.1)
-                       AFS_SYSNAME="i386_obsd31"
-                       ;;
-               i?86-*-openbsd3.2)
-                       AFS_SYSNAME="i386_obsd32"
-                       ;;
-               i?86-*-openbsd3.3)
-                       AFS_SYSNAME="i386_obsd33"
-                       ;;
-               i?86-*-openbsd3.4)
-                       AFS_SYSNAME="i386_obsd34"
-                       ;;
-               i?86-*-openbsd3.5)
-                       AFS_SYSNAME="i386_obsd35"
-                       ;;
-               i?86-*-freebsd4.2*)
-                       AFS_SYSNAME="i386_fbsd_42"
-                       ;;
-               i?86-*-freebsd4.3*)
-                       AFS_SYSNAME="i386_fbsd_43"
-                       ;;
-               i?86-*-freebsd4.4*)
-                       AFS_SYSNAME="i386_fbsd_44"
-                       ;;
-               i?86-*-freebsd4.5*)
-                       AFS_SYSNAME="i386_fbsd_45"
-                       ;;
-               i?86-*-freebsd4.6*)
-                       AFS_SYSNAME="i386_fbsd_46"
-                       ;;
-               i?86-*-freebsd4.7*)
-                       AFS_SYSNAME="i386_fbsd_47"
-                       ;;
-               i?86-*-freebsd5.0*)
-                       AFS_SYSNAME="i386_fbsd_50"
-                       ;;
-               i?86-*-freebsd5.1*)
-                       AFS_SYSNAME="i386_fbsd_51"
-                       ;;
-               i?86-*-freebsd5.2*)
-                       AFS_SYSNAME="i386_fbsd_52"
+               i?86-*-openbsd?.?)
+                       v=${host#*openbsd}
+                       vM=${v%.*}
+                       vm=${v#*.}
+                       AFS_SYSNAME="i386_obsd${vM}${vm}"
+                       ;;
+               sparc64-*-openbsd?.?)
+                       v=${host#*openbsd}
+                       vM=${v%.*}
+                       vm=${v#*.}
+                       AFS_SYSNAME="sparc64_obsd${vM}${vm}"
+                       ;;
+               i?86-*-freebsd?.*)
+                       v=${host#*freebsd}
+                       vM=${v%.*}
+                       vm=${v#*.}
+                       AFS_SYSNAME="i386_fbsd_${vM}${vm}"
                        ;;
                i?86-*-netbsd*1.5*)
                        AFS_PARAM_COMMON=param.nbsd15.h
@@ -451,6 +295,10 @@ else
                        AFS_PARAM_COMMON=param.nbsd20.h
                        AFS_SYSNAME="i386_nbsd20"
                        ;;
+               amd64-*-netbsd*2.0*)
+                       AFS_PARAM_COMMON=param.nbsd20.h
+                       AFS_SYSNAME="amd64_nbsd20"
+                       ;;
                powerpc-*-netbsd*2.0*)
                        AFS_PARAM_COMMON=param.nbsd20.h
                        AFS_SYSNAME="ppc_nbsd20"
@@ -467,6 +315,30 @@ else
                        AFS_PARAM_COMMON=param.nbsd16.h
                        AFS_SYSNAME="ppc_nbsd16"
                        ;;
+               i?86-*-netbsd*2.1*)
+                       AFS_PARAM_COMMON=param.nbsd21.h
+                       AFS_SYSNAME="i386_nbsd21"
+                       ;;
+               i?86-*-netbsd*2.99*)
+                       AFS_PARAM_COMMON=param.nbsd30.h
+                       AFS_SYSNAME="i386_nbsd30"
+                       ;;
+               i?86-*-netbsd*3.[[0-8]]*)
+                       AFS_PARAM_COMMON=param.nbsd30.h
+                       AFS_SYSNAME="i386_nbsd30"
+                       ;;
+               i?86-*-netbsd*3.99*)
+                       AFS_PARAM_COMMON=param.nbsd30.h
+                       AFS_SYSNAME="i386_nbsd30"
+                       ;;
+               i?86-*-netbsd*4.[[0-8]]*)
+                       AFS_PARAM_COMMON=param.nbsd40.h
+                       AFS_SYSNAME="i386_nbsd40"
+                       ;;
+               i?86-*-netbsd*4.99*)
+                       AFS_PARAM_COMMON=param.nbsd40.h
+                       AFS_SYSNAME="i386_nbsd40"
+                       ;;
                hppa*-hp-hpux11.0*)
                        AFS_SYSNAME="hp_ux110"
                        ;;
@@ -542,6 +414,21 @@ else
                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"
+                       ;;
+               i386-apple-darwin8.*)
+                       AFS_SYSNAME="x86_darwin_80"
+                       ;;
+               powerpc-apple-darwin9.*)
+                       AFS_SYSNAME="ppc_darwin_90"
+                       ;;
+               i386-apple-darwin9.*)
+                       AFS_SYSNAME="x86_darwin_90"
+                       ;;
                sparc-sun-solaris2.5*)
                        AFS_SYSNAME="sun4x_55"
                        enable_login="yes"
@@ -561,6 +448,9 @@ else
                sparc-sun-solaris2.10)
                        AFS_SYSNAME="sun4x_510"
                        ;;
+               sparc-sun-solaris2.11)
+                       AFS_SYSNAME="sun4x_511"
+                       ;;
                sparc-sun-sunos4*)
                        AFS_SYSNAME="sun4_413"
                        enable_login="yes"
@@ -577,6 +467,9 @@ else
                i386-pc-solaris2.10)
                        AFS_SYSNAME="sunx86_510"
                        ;;
+               i386-pc-solaris2.11)
+                       AFS_SYSNAME="sunx86_511"
+                       ;;
                alpha*-dec-osf4.0*)
                        AFS_SYSNAME="alpha_dux40"
                        ;;
@@ -593,7 +486,7 @@ else
                        AFS_SYSNAME="ia64_linuxXX"
                        ;;
                powerpc-*-linux*)
-                       AFS_SYSNAME="ppc_linuxXX"
+                       AFS_SYSNAME="`/bin/arch`_linuxXX"
                        ;;
                powerpc64-*-linux*)
                        AFS_SYSNAME="ppc64_linuxXX"
@@ -616,21 +509,29 @@ else
                i?86-*-linux*)
                        AFS_SYSNAME="i386_linuxXX"
                        ;;
-               parisc-*-linux-gnu)
+               parisc-*-linux-gnu|hppa-*-linux-gnu)
                        AFS_SYSNAME="parisc_linuxXX"
                        enable_pam="no"
                        ;;
                power*-ibm-aix4.2*)
                        AFS_SYSNAME="rs_aix42"
+                       enable_pam="no"
                        ;;
                power*-ibm-aix4.3*)
                        AFS_SYSNAME="rs_aix42"
+                       enable_pam="no"
                        ;;
                power*-ibm-aix5.1*)
                        AFS_SYSNAME="rs_aix51"
+                       enable_pam="no"
                        ;;
                power*-ibm-aix5.2*)
                        AFS_SYSNAME="rs_aix52"
+                       enable_pam="no"
+                       ;;
+               power*-ibm-aix5.3*)
+                       AFS_SYSNAME="rs_aix53"
+                       enable_pam="no"
                        ;;
                x86_64-*-linux-gnu)
                        AFS_SYSNAME="amd64_linuxXX"
@@ -642,8 +543,7 @@ else
                        ;;
        esac
        case $AFS_SYSNAME in
-               *_linux*)
-                       AFS_SYSKVERS=`echo $LINUX_VERSION | awk -F\. '{print $[]1 $[]2}'`
+               *_linux* | *_umlinux*)
                        if test "x${AFS_SYSKVERS}" = "x"; then
                         AC_MSG_ERROR(Couldn't guess your Linux version. Please use the --with-afs-sysname option to configure an AFS sysname.)
                        fi
@@ -667,12 +567,294 @@ else
         AC_MSG_RESULT($AFS_SYSNAME)
 fi
 
+case $AFS_SYSNAME in *_linux* | *_umlinux*)
+
+               # Add (sub-) architecture-specific paths needed by conftests
+               case $AFS_SYSNAME  in
+                       *_umlinux26)
+                               UMLINUX26_FLAGS="-I$LINUX_KERNEL_PATH/arch/um/include"
+                               UMLINUX26_FLAGS="$UMLINUX26_FLAGS -I$LINUX_KERNEL_PATH/arch/um/kernel/tt/include"
+                               UMLINUX26_FLAGS="$UMLINUX26_FLAGS -I$LINUX_KERNEL_PATH/arch/um/kernel/skas/include"
+                               CPPFLAGS="$CPPFLAGS $UMLINUX26_FLAGS"
+               esac
+
+               if test "x$enable_kernel_module" = "xyes"; then
+                if test "x$enable_debug_kernel" = "xno"; then
+                       LINUX_GCC_KOPTS="$LINUX_GCC_KOPTS -fomit-frame-pointer"
+                fi
+                OPENAFS_GCC_SUPPORTS_MARCH
+                AC_SUBST(P5PLUS_KOPTS)
+                OPENAFS_GCC_NEEDS_NO_STRENGTH_REDUCE
+                OPENAFS_GCC_NEEDS_NO_STRICT_ALIASING
+                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_KERNEL_COMPILE_WORKS
+                LINUX_CONFIG_H_EXISTS
+                LINUX_COMPLETION_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_IOP_I_PERMISSION_TAKES_NAMEIDATA
+                LINUX_DOP_D_REVALIDATE_TAKES_NAMEIDATA
+                LINUX_AOP_WRITEBACK_CONTROL
+                LINUX_KERNEL_LINUX_SYSCALL_H
+                LINUX_KERNEL_LINUX_SEQ_FILE_H
+                LINUX_KERNEL_SELINUX
+                LINUX_KERNEL_SOCK_CREATE
+                LINUX_KERNEL_PAGE_FOLLOW_LINK
+                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_TODO
+                LINUX_GET_SB_HAS_STRUCT_VFSMOUNT
+                LINUX_STATFS_TAKES_DENTRY
+                LINUX_REFRIGERATOR
+                LINUX_LINUX_KEYRING_SUPPORT
+                LINUX_KEY_ALLOC_NEEDS_STRUCT_TASK
+                LINUX_DO_SYNC_READ
+                LINUX_GENERIC_FILE_AIO_READ
+                LINUX_FREEZER_H_EXISTS
+                LINUX_INIT_WORK_HAS_DATA
+                 LINUX_EXPORTS_SYS_CHDIR
+                 LINUX_EXPORTS_SYS_CLOSE
+                 LINUX_EXPORTS_SYS_OPEN
+                 LINUX_EXPORTS_SYS_WAIT4
+                LINUX_WHICH_MODULES
+                 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
+                  if test -f "$LINUX_KERNEL_PATH/include/asm/ia32_unistd.h"; then
+                    ac_cv_linux_exports_ia32_sys_call_table=yes
+                  fi
+                 else
+                   LINUX_EXPORTS_INIT_MM
+                   LINUX_EXPORTS_KALLSYMS_ADDRESS
+                   LINUX_EXPORTS_KALLSYMS_SYMBOL
+                   LINUX_EXPORTS_SYS_CALL_TABLE
+                   LINUX_EXPORTS_IA32_SYS_CALL_TABLE
+                   if test "x$ac_cv_linux_exports_sys_call_table" = "xno"; then
+                         linux_syscall_method=none
+                         if test "x$ac_cv_linux_exports_init_mm" = "xyes"; then
+                            linux_syscall_method=scan
+                            if test "x$ac_cv_linux_exports_kallsyms_address" = "xyes"; then
+                               linux_syscall_method=scan_with_kallsyms_address
+                            fi
+                         fi
+                         if test "x$ac_cv_linux_exports_kallsyms_symbol" = "xyes"; then
+                            linux_syscall_method=kallsyms_symbol
+                         fi
+                         if test "x$linux_syscall_method" = "xnone"; then
+                           AC_MSG_WARN([no available sys_call_table access method -- guessing scan])
+                            linux_syscall_method=scan
+                         fi
+                   fi
+                 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 -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)
+                 fi
+                 if test "x$ac_cv_linux_exports_ia32_sys_call_table" = "xyes"; then
+                  AC_DEFINE(EXPORTED_IA32_SYS_CALL_TABLE)
+                 fi
+                 if test "x$ac_cv_linux_exports_kallsyms_symbol" = "xyes"; then
+                  AC_DEFINE(EXPORTED_KALLSYMS_SYMBOL)
+                 fi
+                 if test "x$ac_cv_linux_exports_kallsyms_address" = "xyes"; then
+                  AC_DEFINE(EXPORTED_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_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_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_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_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_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_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_freezer_h_exists" = "xyes" ; then
+                 AC_DEFINE(FREEZER_H_EXISTS, 1, [define if you have linux/freezer.h])
+                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
+                :
+               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 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 
@@ -790,8 +972,13 @@ else
 fi
 
 PTHREAD_LIBS=error
-AC_CHECK_LIB(pthread, pthread_attr_init,
-             PTHREAD_LIBS="-lpthread")
+if test "x$MKAFS_OSTYPE" = OBSD; then
+        PTHREAD_LIBS="-pthread"
+fi
+if test "x$PTHREAD_LIBS" = xerror; then
+        AC_CHECK_LIB(pthread, pthread_attr_init,
+                PTHREAD_LIBS="-lpthread")
+fi
 if test "x$PTHREAD_LIBS" = xerror; then
         AC_CHECK_LIB(pthreads, pthread_attr_init,
                 PTHREAD_LIBS="-lpthreads")
@@ -804,6 +991,11 @@ if test "x$PTHREAD_LIBS" = xerror; then
         AC_CHECK_FUNC(pthread_attr_init, PTHREAD_LIBS="")
 fi
 if test "x$PTHREAD_LIBS" = xerror; then
+        # pthread_attr_init is a macro under HPUX 11.0 and 11.11
+        AC_CHECK_LIB(pthread, pthread_attr_destroy,
+                PTHREAD_LIBS="-lpthread")
+fi
+if test "x$PTHREAD_LIBS" = xerror; then
         AC_MSG_WARN(*** Unable to locate working posix thread library ***)
 fi
 AC_SUBST(PTHREAD_LIBS)
@@ -813,10 +1005,7 @@ if test "$enable_obsolete" = "yes"; then
        WITH_OBSOLETE=YES
 fi
 
-WITH_INSECURE=NO
-if test "$enable_insecure" = "yes"; then
-       WITH_INSECURE=YES
-fi
+HOST_CPU="$host_cpu"
 
 if test "x$with_bsd_kernel_headers" != "x"; then
        BSD_KERNEL_PATH="$with_bsd_kernel_headers"
@@ -828,11 +1017,11 @@ if test "x$with_bsd_kernel_build" != "x"; then
        BSD_KERNEL_BUILD="$with_bsd_kernel_build"
 else
        case $AFS_SYSNAME in
-               i386_fbsd_4?)
+               *_fbsd_4?)
                        BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/compile/GENERIC"
                        ;;
-               i386_fbsd_5?)
-                       BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/i386/compile/GENERIC"
+               *_fbsd_*)
+                       BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/${HOST_CPU}/compile/GENERIC"
                        ;;
        esac
 fi
@@ -850,6 +1039,20 @@ if test "$enable_bitmap_later" = "yes"; then
        AC_DEFINE(BITMAP_LATER, 1, [define if you want to salvager to check bitmasks later])
 fi
 
+if test "$enable_demand_attach_fs" = "yes"; then
+       AC_DEFINE(DEMAND_ATTACH_ENABLE, 1, [define if you want the demand attach fileserver])
+       DEMAND_ATTACH="yes"
+else
+       DEMAND_ATTACH="no"
+fi
+AC_SUBST(DEMAND_ATTACH)
+
+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_full_vos_listvol_switch" = "yes"; then
        AC_DEFINE(FULL_LISTVOL_SWITCH, 1, [define if you want to want listvol switch])
 fi
@@ -882,10 +1085,10 @@ if test "$enable_tivoli_tsm" = "yes"; then
        XBSADIR1=/usr/tivoli/tsm/client/api/bin/xopen
        XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen
 
-       if test -e "$XBSADIR1/xbsa.h"; then
+       if test -r "$XBSADIR1/xbsa.h"; then
                XBSA_CFLAGS="-Dxbsa -I$XBSADIR1"
                AC_MSG_RESULT([yes, $XBSA_CFLAGS])
-       elif test -e "$XBSADIR2/xbsa.h"; then
+       elif test -r "$XBSADIR2/xbsa.h"; then
                XBSA_CFLAGS="-Dxbsa -I$XBSADIR2"
                AC_MSG_RESULT([yes, $XBSA_CFLAGS])
        else
@@ -905,7 +1108,7 @@ 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)
 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)
+AC_CHECK_HEADERS(security/pam_modules.h siad.h usersec.h ucontext.h regex.h values.h)
 
 if test "$ac_cv_header_security_pam_modules_h" = yes -a "$enable_pam" = yes; then
        HAVE_PAM="yes"
@@ -921,9 +1124,10 @@ else
 fi
 AC_SUBST(BUILD_LOGIN)
 
-AC_CHECK_FUNCS(utimes random srandom getdtablesize snprintf strlcat strlcpy re_comp re_exec)
-AC_CHECK_FUNCS(setprogname getprogname sigaction mkstemp vsnprintf strerror)
-
+AC_CHECK_FUNCS(utimes random srandom getdtablesize snprintf strlcat strlcpy re_comp re_exec flock)
+AC_CHECK_FUNCS(setprogname getprogname sigaction mkstemp vsnprintf strerror strcasestr)
+AC_CHECK_FUNCS(setvbuf)
+AC_FUNC_SETVBUF_REVERSED
 AC_CHECK_FUNCS(regcomp regexec regerror)
 AC_MSG_CHECKING([for POSIX regex library])
 if test "$ac_cv_header_regex_h" = "yes" && \
@@ -939,7 +1143,23 @@ fi
 AC_CHECK_TYPE(ssize_t, int)
 AC_SIZEOF_TYPE(long)
 
+AC_MSG_CHECKING(size of time_t)
+AC_CACHE_VAL(ac_cv_sizeof_time_t,
+[AC_TRY_RUN([#include <stdio.h>
+#include <time.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(time_t));
+  exit(0);
+}], ac_cv_sizeof_time_t=`cat conftestval`, ac_cv_sizeof_time_t=0)
+])
+AC_MSG_RESULT($ac_cv_sizeof_time_t)
+AC_DEFINE_UNQUOTED(SIZEOF_TIME_T, $ac_cv_sizeof_time_t)
+
 AC_CHECK_FUNCS(timegm)
+AC_CHECK_FUNCS(daemon)
 
 dnl Directory PATH handling
 if test "x$enable_transarc_paths" = "xyes"  ; then 
@@ -988,6 +1208,7 @@ AC_SUBST(AFS_PARAM_COMMON)
 AC_SUBST(ENABLE_KERNEL_MODULE)
 AC_SUBST(LIB_AFSDB)
 AC_SUBST(LINUX_KERNEL_PATH)
+AC_SUBST(HOST_CPU)
 AC_SUBST(BSD_KERNEL_PATH)
 AC_SUBST(BSD_KERNEL_BUILD)
 AC_SUBST(LINUX_VERSION)
@@ -998,11 +1219,11 @@ AC_SUBST(TOP_INCDIR)
 AC_SUBST(TOP_LIBDIR)
 AC_SUBST(DEST)
 AC_SUBST(WITH_OBSOLETE)
-AC_SUBST(WITH_INSECURE)
 AC_SUBST(DARWIN_INFOFILE)
 AC_SUBST(IRIX_BUILD_IP35)
 
 OPENAFS_OSCONF
+OPENAFS_KRB5CONF
 
 TOP_SRCDIR="${srcdir}/src"
 dnl
@@ -1028,5 +1249,6 @@ HELPER_SPLINTCFG="${TOP_SRCDIR}/splint.cfg"
 AC_SUBST(HELPER_SPLINT)
 AC_SUBST(HELPER_SPLINTCFG)
 
+mkdir -p ${TOP_OBJDIR}/src/JAVA/libjafs
 
 ])