socklen-t-check-20090316

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 633a87c..1ce5014 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -41,7 +41,16 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 # else
 #  undef WORDS_BIGENDIAN
 # endif
-#endif])
+#endif
+#ifdef UKERNEL
+/*
+ * Always use 64-bit file offsets for UKERNEL code. Needed for UKERNEL stuff to
+ * play nice with some other interfaces like FUSE. We technically only would
+ * need to define this when building for such interfaces, but set it always to
+ * try and reduce potential confusion. 
+ */
+#define _FILE_OFFSET_BITS 64
+#endif
 
 #undef AFS_AFSDB_ENV
 #undef AFS_LARGEFILE_ENV
@@ -81,7 +90,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #undef ENABLE_REDHAT_BUILDSYS
 #if defined(ENABLE_REDHAT_BUILDSYS) && defined(KERNEL) && defined(REDHAT_FIX)
 #include "redhat-fix.h"
-#endif
+#endif])
 
 AC_CANONICAL_HOST
 SRCDIR_PARENT=`pwd`
@@ -308,7 +317,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.
@@ -440,10 +448,14 @@ case $system in
                MKAFS_OSTYPE=DARWIN
                 AC_MSG_RESULT(x86_darwin)
                 ;;
-       *-freebsd*)
+       i386-*-freebsd*)
                MKAFS_OSTYPE=FBSD
                AC_MSG_RESULT(i386_fbsd)
                ;;
+       x86_64-*-freebsd*)
+               MKAFS_OSTYPE=FBSD
+               AC_MSG_RESULT(amd64_fbsd)
+               ;;
        *-netbsd*)
                MKAFS_OSTYPE=NBSD
                AC_MSG_RESULT(nbsd)
@@ -480,6 +492,12 @@ else
                        vm=${v#*.}
                        AFS_SYSNAME="i386_fbsd_${vM}${vm}"
                        ;;
+               x86_64-*-freebsd?.*)
+                       v=${host#*freebsd}
+                       vM=${v%.*}
+                       vm=${v#*.}
+                       AFS_SYSNAME="amd64_fbsd_${vM}${vm}"
+                       ;;
                i?86-*-netbsd*1.5*)
                        AFS_SYSNAME="i386_nbsd15"
                        ;;
@@ -820,6 +838,8 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_HAVE_WRITE_BEGIN_AOP
                  LINUX_HAVE_BDI_INIT
                  LINUX_KMEM_CACHE_INIT
+                 LINUX_HAVE_GRAB_CACHE_PAGE_WRITE_BEGIN
+                 LINUX_STRUCT_TASK_HAS_CRED
                 LINUX_HAVE_KMEM_CACHE_T
                 LINUX_KMEM_CACHE_CREATE_TAKES_DTOR
                 LINUX_D_PATH_TAKES_STRUCT_PATH
@@ -895,6 +915,11 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_REGISTER_SYSCTL_TABLE_NOFLAG
                 LINUX_SYSCTL_TABLE_CHECKING
                 LINUX_HAVE_IGET
+                LINUX_HAVE_I_SIZE_READ
+                LINUX_HAVE_D_ALLOC_ANON
+                if test "x$ac_cv_linux_d_alloc_anon" = "xno"; then
+                  AC_DEFINE([AFS_NONFSTRANS], 1, [define to disable the nfs translator])
+                fi
                 LINUX_FS_STRUCT_NAMEIDATA_HAS_PATH
                 LINUX_EXPORTS_INIT_MM
                  LINUX_EXPORTS_SYS_CHDIR
@@ -1530,8 +1555,16 @@ else
     AC_MSG_RESULT(no)
 fi
 
+AC_TYPE_SOCKLEN_T
 AC_TYPE_SIGNAL
 AC_CHECK_TYPE(ssize_t, int)
+AC_CHECK_TYPES(sig_t, , ,
+  [#include <sys/types.h>
+   #include <signal.h> ])
+AH_BOTTOM(
+[#ifndef HAVE_SIG_T
+typedef RETSIGTYPE (*sig_t) ();
+#endif])
 AC_CHECK_TYPE([sig_atomic_t], ,
     [AC_DEFINE([sig_atomic_t], [int],
         [Define to int if <signal.h> does not define.])],