Remove HAVE_STRUCT_BUF test
[openafs.git] / acinclude.m4
index 01c2e17..1064410 100644 (file)
@@ -47,13 +47,9 @@ 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 BOS_RESTRICTED_MODE
 #undef FAST_RESTART
-#undef FULL_LISTVOL_SWITCH
 #undef COMPLETION_H_EXISTS
 #undef DEFINED_FOR_EACH_PROCESS
 #undef DEFINED_PREV_TASK
@@ -78,7 +74,6 @@ AH_VERBATIM([OPENAFS_HEADER],
 #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
@@ -96,25 +91,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([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
@@ -157,11 +137,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])],
@@ -365,33 +340,37 @@ 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/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/linux/autoconf.h"; then
                     enable_kernel_module="no"
                 fi
@@ -417,6 +396,8 @@ 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
@@ -826,6 +807,13 @@ else
         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
@@ -892,6 +880,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                  LINUX_KMEM_CACHE_INIT
                  LINUX_HAVE_GRAB_CACHE_PAGE_WRITE_BEGIN
                 LINUX_HAVE_PAGEVEC_LRU_ADD_FILE
+                LINUX_HAVE_SPLICE_DIRECT_TO_ACTOR
                  LINUX_STRUCT_TASK_HAS_CRED
                 LINUX_STRUCT_PROC_DIR_ENTRY_HAS_OWNER
                 LINUX_HAVE_KMEM_CACHE_T
@@ -1259,41 +1248,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 +1297,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
@@ -1461,24 +1415,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_bos_restricted_mode" = "yes"; then
-       AC_DEFINE(BOS_RESTRICTED_MODE, 1, [define if you want to want bos restricted mode])
-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
@@ -1508,11 +1450,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=""