DEVEL15-linux-new-aop-20081108

[openafs.git] / src / cf / linux-test3.m4

diff --git a/src/cf/linux-test3.m4 b/src/cf/linux-test3.m4
index e7d547f..8c3b296 100644 (file)
--- a/src/cf/linux-test3.m4
+++ b/src/cf/linux-test3.m4
@@ -33,6 +33,9 @@ AC_SUBST(RHCONFIG_SP)
 AC_SUBST(RHCONFIG_MP)
 ])
 
+
+dnl This depends on LINUX_CONFIG_H_EXISTS running first!
+
 AC_DEFUN([LINUX_WHICH_MODULES],[
 if test "x$enable_redhat_buildsys" = "xyes"; then
   MPS=Default
@@ -40,12 +43,17 @@ else
   save_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -D__KERNEL__ $RHCONFIG_SP $CPPFLAGS"
   AC_MSG_CHECKING(which kernel modules to build)
+  if test "x$ac_cv_linux_config_h_exists" = "xyes"; then
+    CPPFLAGS="-DCONFIG_H_EXISTS $CPPFLAGS"
+  fi
   if test "x$ac_linux_rhconfig" = "xyes"; then
       MPS="MP SP"
   else
   AC_CACHE_VAL(ac_cv_linux_config_smp, [
-  AC_TRY_COMPILE(
-[#include <linux/config.h>
+  AC_TRY_KBUILD(
+[#ifdef CONFIG_H_EXISTS
+#include <linux/config.h>
+#endif
 ],
 [#ifndef CONFIG_SMP
 lose;
@@ -82,38 +90,6 @@ AC_TRY_COMPILE(
 AC_MSG_RESULT($ac_cv_linux_kernel_is_selinux)
 CPPFLAGS="$save_CPPFLAGS"])
 
-AC_DEFUN([LINUX_KERNEL_SOCK_CREATE],[
-AC_MSG_CHECKING(for 5th argument in sock_create found in some SELinux kernels)
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -D__KERNEL__ $CPPFLAGS"
-AC_CACHE_VAL(ac_cv_linux_kernel_sock_create_v,
-[
-AC_TRY_COMPILE(
-  [#include <linux/net.h>],
-  [
-  sock_create(0,0,0,0,0)
-  ],
-  ac_cv_linux_kernel_sock_create_v=yes,
-  ac_cv_linux_kernel_sock_create_v=no)])
-AC_MSG_RESULT($ac_cv_linux_kernel_sock_create_v)
-CPPFLAGS="$save_CPPFLAGS"])
-
-AC_DEFUN([LINUX_KERNEL_PAGE_FOLLOW_LINK],[
-AC_MSG_CHECKING(for page_follow_link_light vs page_follow_link)
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-default -Werror-implicit-function-declaration -D__KERNEL__ $CPPFLAGS"
-AC_CACHE_VAL(ac_cv_linux_kernel_page_follow_link,
-[
-AC_TRY_COMPILE(
-  [#include <linux/fs.h>],
-  [
-  page_follow_link(0,0)
-  ],
-  ac_cv_linux_kernel_page_follow_link=yes,
-  ac_cv_linux_kernel_page_follow_link=no)])
-AC_MSG_RESULT($ac_cv_linux_kernel_page_follow_link)
-CPPFLAGS="$save_CPPFLAGS"])
-
 AC_DEFUN([LINUX_KERNEL_LINUX_SEQ_FILE_H],[
   AC_MSG_CHECKING(for linux/seq_file.h in kernel)
   if test -f "${LINUX_KERNEL_PATH}/include/linux/seq_file.h"; then