Use AC_USE_SYSTEM_EXTENSIONS
[openafs.git] / acinclude.m4
index dd37867..e450150 100644 (file)
@@ -5,8 +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([OPENAFS_HEADER],
-[#undef HAVE_RES_SEARCH
+AH_BOTTOM([
+#undef HAVE_RES_SEARCH
 #undef STRUCT_SOCKADDR_HAS_SA_LEN
 #if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
 # if ENDIANESS_IN_SYS_PARAM_H
@@ -47,16 +47,12 @@ AH_VERBATIM([OPENAFS_HEADER],
 #define _FILE_OFFSET_BITS 64
 #endif
 
-#undef AFS_AFSDB_ENV
-#undef AFS_LARGEFILE_ENV
 #undef AFS_NAMEI_ENV
 #undef BITMAP_LATER
 #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
@@ -64,20 +60,14 @@ AH_VERBATIM([OPENAFS_HEADER],
 #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
@@ -95,19 +85,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([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
@@ -150,11 +131,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])],
@@ -317,7 +293,6 @@ dnl AC_MINIX
 dnl Various compiler setup.
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
-COMPILER_HAS_FUNCTION_MACRO
 
 dnl Checks for programs.
 AC_PROG_INSTALL
@@ -389,7 +364,8 @@ case $system in
                      fi
                    fi
                 fi
-                if test ! -f "$LINUX_KERNEL_BUILD/include/linux/autoconf.h"; then
+                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
@@ -417,7 +393,6 @@ case $system in
                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
                 ;;
@@ -602,69 +577,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*)
-                       AFS_SYSNAME="ppc_darwin_70"
-                       ;;
-               powerpc-apple-darwin7.5*)
+               powerpc-apple-darwin7*)
                        AFS_SYSNAME="ppc_darwin_70"
                        ;;
-               powerpc-apple-darwin8.0*)
-                       AFS_SYSNAME="ppc_darwin_80"
-                       ;;
                powerpc-apple-darwin8.*)
                        AFS_SYSNAME="ppc_darwin_80"
                        ;;
@@ -807,10 +722,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],
@@ -818,13 +731,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
@@ -849,6 +768,7 @@ case $AFS_SYSNAME in
     *_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 ;;
@@ -892,10 +812,11 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                  LINUX_HAVE_GRAB_CACHE_PAGE_WRITE_BEGIN
                 LINUX_HAVE_PAGEVEC_LRU_ADD_FILE
                 LINUX_HAVE_SPLICE_DIRECT_TO_ACTOR
+                LINUX_HAVE_PAGE_OFFSET
+                LINUX_HAVE_ZERO_USER_SEGMENTS
                  LINUX_STRUCT_TASK_HAS_CRED
                 LINUX_STRUCT_PROC_DIR_ENTRY_HAS_OWNER
                 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
@@ -907,22 +828,13 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_DEFINES_PREV_TASK
                 LINUX_FS_STRUCT_SUPER_HAS_ALLOC_INODE
                 LINUX_STRUCT_SUPER_BLOCK_HAS_S_BDI
-                LINUX_FS_STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK
-                LINUX_FS_STRUCT_ADDRESS_SPACE_HAS_GFP_MASK
+                LINUX_STRUCT_BDI_HAS_NAME
                 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
@@ -933,12 +845,10 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 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_POSIX_TEST_LOCK_RETURNS_CONFLICT
                 LINUX_POSIX_TEST_LOCK_CONFLICT_ARG
-                LINUX_KERNEL_SELINUX
                 LINUX_KERNEL_SOCK_CREATE
                 LINUX_KERNEL_PAGE_FOLLOW_LINK
                 LINUX_KERNEL_HLIST_UNHASHED
@@ -988,9 +898,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 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
                 if test "x$with_linux_kernel_packaging" = "xno" ; then
                   LINUX_WHICH_MODULES
@@ -1031,21 +939,12 @@ 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
@@ -1079,57 +978,27 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 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 
+                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
@@ -1139,9 +1008,6 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 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
@@ -1259,41 +1125,6 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                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])
@@ -1343,7 +1174,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
@@ -1356,6 +1187,8 @@ else
   
 fi
 
+AC_CHECK_RESOLV_RETRANS
+
 AC_CACHE_VAL(ac_cv_setsockopt_iprecverr,
 [
 AC_MSG_CHECKING([for setsockopt(, SOL_IP, IP_RECVERR)])
@@ -1461,20 +1294,12 @@ 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_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
@@ -1504,11 +1329,6 @@ else
        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=""
@@ -1547,12 +1367,12 @@ 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 grp.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 sys/pag.h)
-AC_CHECK_HEADERS(windows.h malloc.h winsock2.h direct.h io.h sys/user.h sys/ipc.h)
-AC_CHECK_HEADERS(security/pam_modules.h siad.h usersec.h ucontext.h regex.h values.h sys/statvfs.h sys/statfs.h sys/bitypes.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)
 
@@ -1569,6 +1389,8 @@ AC_CHECK_TYPES([fsblkcnt_t],,,[
 #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
         case $AFS_SYSNAME in
@@ -1591,7 +1413,7 @@ 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 getcwd)
 AC_CHECK_FUNCS(regcomp regexec regerror)
@@ -1609,12 +1431,12 @@ 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_TYPES(sig_t, , ,
-  [#include <sys/types.h>
-   #include <signal.h> ])
 AC_CHECK_TYPE([sig_atomic_t], ,
     [AC_DEFINE([sig_atomic_t], [int],
         [Define to int if <signal.h> does not define.])],
@@ -1622,6 +1444,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)