linux PageCheck may be PageFsMisc

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index c83f164..2ba05df 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -810,6 +810,16 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                  AC_CHECK_LINUX_FUNC([bdi_init],
                                     [#include <linux/backing-dev.h>],
                                     [bdi_init(NULL);])
+                 AC_CHECK_LINUX_FUNC([PageChecked],
+                                    [#include <linux/mm.h>
+#include <linux/page-flags.h>],
+                                    [struct page *_page;
+                                      int bchecked = PageChecked(_page);])
+                 AC_CHECK_LINUX_FUNC([PageFsMisc],
+                                    [#include <linux/mm.h>
+#include <linux/page-flags.h>],
+                                    [struct page *_page;
+                                      int bchecked = PageFsMisc(_page);])
                 AC_CHECK_LINUX_FUNC([ctl_table], [ctl_name], [sysctl.h])
                 AC_CHECK_LINUX_FUNC([current_kernel_time],
                                     [#include <linux/time.h>],
@@ -880,6 +890,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_EXPORTS_PROC_ROOT_FS
                  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
@@ -965,17 +976,18 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                fi
 esac
 
-AC_CACHE_VAL(ac_cv_sockaddr_len,
-[
-AC_MSG_CHECKING([if struct sockaddr has sa_len field])
-AC_TRY_COMPILE( [#include <sys/types.h>
+AC_CACHE_CHECK([if struct sockaddr has sa_len field],
+    [ac_cv_sockaddr_len],
+    [AC_TRY_COMPILE( [#include <sys/types.h>
 #include <sys/socket.h>],
-[struct sockaddr *a;
-a->sa_len=0;], ac_cv_sockaddr_len=yes, ac_cv_sockaddr_len=no)
-AC_MSG_RESULT($ac_cv_sockaddr_len)])
-if test "$ac_cv_sockaddr_len" = "yes"; then
-   AC_DEFINE(STRUCT_SOCKADDR_HAS_SA_LEN, 1, [define if you struct sockaddr sa_len])
-fi
+                     [struct sockaddr *a; a->sa_len=0;],
+                    [ac_cv_sockaddr_len=yes],
+                    [ac_cv_sockaddr_len=no])
+])
+AS_IF([test "$ac_cv_sockaddr_len" = "yes"],
+      [AC_DEFINE(STRUCT_SOCKADDR_HAS_SA_LEN, 1,
+                [define if you struct sockaddr sa_len])])
+
 if test "x${MKAFS_OSTYPE}" = "xIRIX"; then
         echo Skipping library tests because they confuse Irix.
 else
@@ -1029,18 +1041,20 @@ fi
 
 AC_CHECK_RESOLV_RETRANS
 
-AC_CACHE_VAL(ac_cv_setsockopt_iprecverr,
-[
-AC_MSG_CHECKING([for setsockopt(, SOL_IP, IP_RECVERR)])
-AC_TRY_COMPILE( [#include <sys/types.h>
+AC_CACHE_CHECK([for setsockopt(, SOL_IP, IP_RECVERR)],
+    [ac_cv_setsockopt_iprecverr],
+    [AC_TRY_COMPILE( [
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>],
 [int on=1;
-setsockopt(0, SOL_IP, IP_RECVERR, &on, sizeof(on));], ac_cv_setsockopt_iprecverr=yes, ac_cv_setsockopt_iprecverr=no)
-AC_MSG_RESULT($ac_cv_setsockopt_iprecverr)])
-if test "$ac_cv_setsockopt_iprecverr" = "yes"; then
-   AC_DEFINE(ADAPT_PMTU_RECVERR, 1, [define if asynchronous socket errors can be received])
-fi
+setsockopt(0, SOL_IP, IP_RECVERR, &on, sizeof(on));],
+       [ac_cv_setsockopt_iprecverr=yes],
+       [ac_cv_setsockopt_iprecverr=no])])
+
+AS_IF([test "$ac_cv_setsockopt_iprecverr" = "yes"],
+      [AC_DEFINE(ADAPT_PMTU_RECVERR, 1,
+                [define if asynchronous socket errors can be received])])
 
 PTHREAD_LIBS=error
 if test "x$MKAFS_OSTYPE" = OBSD; then
@@ -1086,9 +1100,6 @@ if test "x$with_bsd_kernel_build" != "x"; then
        BSD_KERNEL_BUILD="$with_bsd_kernel_build"
 else
        case $AFS_SYSNAME in
-               *_fbsd_4?)
-                       BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/compile/GENERIC"
-                       ;;
                *_fbsd_*)
                        BSD_KERNEL_BUILD="${BSD_KERNEL_PATH}/${HOST_CPU}/compile/GENERIC"
                        ;;
@@ -1270,7 +1281,6 @@ else
     AC_MSG_RESULT(no)
 fi
 
-AC_TYPE_SOCKLEN_T
 AC_TYPE_SIGNAL
 AC_CHECK_SIZEOF(void *)
 AC_CHECK_SIZEOF(unsigned long long)
@@ -1282,6 +1292,9 @@ AC_CHECK_TYPES([ssize_t])
 AC_CHECK_TYPES([sig_atomic_t],[],[],
 [#include <sys/types.h>
 #include <signal.h>])
+AC_CHECK_TYPES([socklen_t],[],[],
+[#include <sys/types.h>
+#include <sys/socket.h>])
 AC_SIZEOF_TYPE(long)
 
 AC_HEADER_PAM_CONST