linux-2624-20071123

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

diff --git a/src/cf/linux-test1.m4 b/src/cf/linux-test1.m4
index 44f2d9f..0dd08e8 100644 (file)
--- a/src/cf/linux-test1.m4
+++ b/src/cf/linux-test1.m4
@@ -1,16 +1,83 @@
-AC_DEFUN([LINUX_INODE_SETATTR_RETURN_TYPE],[
-AC_MSG_CHECKING(for inode_setattr return type)
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -I${LINUX_KERNEL_PATH}/include/asm/mach-${SUBARCH} -D__KERNEL__ $CPPFLAGS"
-AC_CACHE_VAL(ac_cv_linux_func_inode_setattr_returns_int,
-[
-AC_TRY_COMPILE(
-[#include <linux/fs.h>],
-[struct inode _inode; 
-struct iattr _iattr;
-int i; 
-i = inode_setattr(&_inode, &_iattr);], 
-ac_cv_linux_func_inode_setattr_returns_int=yes,
-ac_cv_linux_func_inode_setattr_returns_int=no)])
-AC_MSG_RESULT($ac_cv_linux_func_inode_setattr_returns_int)
-CPPFLAGS="$save_CPPFLAGS"])
+# AC_TRY_KBUILD26([INCLUDES], [FUNCTION-BODY],
+#                 [ACTION-IF-SUCCESS], [ACTION-IF-FAILURE])
+#
+AC_DEFUN([AC_TRY_KBUILD26],[  rm -fr conftest.dir
+  if test "x$ac_linux_kbuild_requires_extra_cflags" = "xyes" ; then
+    CFLAGS_PREFIX='EXTRA_'
+  fi
+  if mkdir conftest.dir &&
+    cat >conftest.dir/Makefile <<_ACEOF &&
+${CFLAGS_PREFIX}CFLAGS += $CPPFLAGS
+
+obj-m += conftest.o
+_ACEOF
+    cat >conftest.dir/conftest.c <<\_ACEOF &&
+/* confdefs.h */
+_ACEOF
+    cat confdefs.h >>conftest.dir/conftest.c &&
+    cat >>conftest.dir/conftest.c <<\_ACEOF &&
+/* end confdefs.h */
+#include <linux/module.h>
+$1
+
+void conftest(void)
+{ 
+$2
+} 
+
+MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
+_ACEOF
+    echo make -C $LINUX_KERNEL_PATH M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD
+    make -C $LINUX_KERNEL_PATH M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD 2>conftest.err
+    then [$3]
+    else
+      sed '/^ *+/d' conftest.err >&AS_MESSAGE_LOG_FD
+      echo "$as_me: failed using Makefile:" >&AS_MESSAGE_LOG_FD
+      sed 's/^/| /' conftest.dir/Makefile >&AS_MESSAGE_LOG_FD
+      echo "$as_me: and program was:" >&AS_MESSAGE_LOG_FD
+      sed 's/^/| /' conftest.dir/conftest.c >&AS_MESSAGE_LOG_FD
+      [$4]
+  fi; rm -fr conftest.err conftest.dir])
+
+  
+# AC_TRY_KBUILD24([INCLUDES], [FUNCTION-BODY],
+#                 [ACTION-IF-SUCCESS], [ACTION-IF-FAILURE])
+#
+AC_DEFUN([AC_TRY_KBUILD24], [
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="-I$LINUX_KERNEL_PATH/include -D__KERNEL__ $CPPFLAGS"
+  AC_TRY_COMPILE([$1], [$2], [$3], [$4])
+  CPPFLAGS="$ac_save_CPPFLAGS"])
+
+
+# AC_TRY_KBUILD([INCLUDES], [FUNCTION-BODY],
+#               [ACTION-IF-SUCCESS], [ACTION-IF-FAILURE])
+#
+AC_DEFUN([AC_TRY_KBUILD], [
+  if test $AFS_SYSKVERS -ge 26 ; then
+    AC_TRY_KBUILD26([$1], [$2], [$3], [$4])
+  else
+    AC_TRY_KBUILD24([$1], [$2], [$3], [$4])
+  fi])
+
+AC_DEFUN([LINUX_KERNEL_COMPILE_WORKS], [
+  AC_MSG_CHECKING([for linux kernel module build works])
+  AC_TRY_KBUILD(
+[#include <linux/sched.h>
+#include <linux/fs.h>],
+    [],:,AC_MSG_RESULT(no)
+    AC_MSG_FAILURE([Fix problem or use --disable-kernel-module...]))
+  AC_MSG_RESULT(yes)])
+
+AC_DEFUN([LINUX_KBUILD_USES_EXTRA_CFLAGS], [
+  AC_MSG_CHECKING([if linux kbuild requires EXTRA_CFLAGS])
+  save_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS=-Wall
+  AC_TRY_KBUILD(
+[#include <linux/sched.h>
+#include <linux/fs.h>],
+    [],
+    ac_linux_kbuild_requires_extra_cflags=no,
+    ac_linux_kbuild_requires_extra_cflags=yes)
+    CPPFLAGS="$save_CPPFLAGS"
+    AC_MSG_RESULT($ac_linux_kbuild_requires_extra_cflags)])