linux-config-h-died-20061109

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 7acbf69..7f7fd6b 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -120,7 +120,10 @@ case $system in
                 if test "x$with_linux_kernel_headers" != "x"; then
                   LINUX_KERNEL_PATH="$with_linux_kernel_headers"
                 else
-                  LINUX_KERNEL_PATH="/lib/modules/`uname -r`/build"
+                  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
@@ -307,7 +310,7 @@ else
                        AFS_PARAM_COMMON=param.nbsd30.h
                        AFS_SYSNAME="i386_nbsd30"
                        ;;
-               i?86-*-netbsd*3.0*)
+               i?86-*-netbsd*3.[[0-8]]*)
                        AFS_PARAM_COMMON=param.nbsd30.h
                        AFS_SYSNAME="i386_nbsd30"
                        ;;
@@ -315,6 +318,14 @@ else
                        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"
                        ;;
@@ -519,6 +530,7 @@ else
                        fi
                        _AFS_SYSNAME=`echo $AFS_SYSNAME|sed s/XX\$/$AFS_SYSKVERS/`
                        AFS_SYSNAME="$_AFS_SYSNAME"
+                       AFS_PARAM_COMMON="param.linux${AFS_SYSKVERS}.h"
                        save_CPPFLAGS="$CPPFLAGS"
                        CPPFLAGS="-I${LINUX_KERNEL_PATH}/include $CPPFLAGS"
                        AC_TRY_COMPILE(
@@ -564,6 +576,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                   [LINUX_BUILD_VNODE_FROM_INODE(${srcdir}/src/config,src/afs/LINUX,${srcdir}/src/afs/LINUX)]
                 )
 
+                LINUX_CONFIG_H_EXISTS
                 LINUX_COMPLETION_H_EXISTS
                 LINUX_DEFINES_FOR_EACH_PROCESS
                 LINUX_DEFINES_PREV_TASK
@@ -603,9 +616,16 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_RLIM
                 LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_SIGNAL_RLIM
                 LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_EXIT_STATE
+                LINUX_GET_SB_HAS_STRUCT_VFSMOUNT
                 LINUX_REFRIGERATOR
                 LINUX_LINUX_KEYRING_SUPPORT
                 LINUX_KEY_ALLOC_NEEDS_STRUCT_TASK
+                LINUX_DO_SYNC_READ
+                LINUX_GENERIC_FILE_AIO_READ
+                 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])
@@ -619,9 +639,6 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                    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
@@ -651,6 +668,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 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
@@ -699,6 +719,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 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
@@ -762,6 +785,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 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_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_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
@@ -1062,7 +1088,7 @@ else
 fi
 AC_SUBST(BUILD_LOGIN)
 
-AC_CHECK_FUNCS(utimes random srandom getdtablesize snprintf strlcat strlcpy re_comp re_exec)
+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