Linux: Fix builds on RHEL4

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index a88e464..2b37105 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -364,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
@@ -721,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],
@@ -732,7 +731,6 @@ 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
@@ -814,6 +812,8 @@ 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
@@ -1187,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)])