X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fcf%2Flinux-test1.m4;h=2a991053aa46c946c0ada38420790be9ca98070e;hp=7deea944f884b85d212b99df012216689e32eb21;hb=182a18931a3fc696a53288dbd6fcf04e109f785b;hpb=ee9d148cc50d41832b79bab4aef0672bdfb63f54

diff --git a/src/cf/linux-test1.m4 b/src/cf/linux-test1.m4
index 7deea94..2a99105 100644
--- a/src/cf/linux-test1.m4
+++ b/src/cf/linux-test1.m4
@@ -1,16 +1,14 @@
 # AC_TRY_KBUILD26([INCLUDES], [FUNCTION-BODY],
 #                 [ACTION-IF-SUCCESS], [ACTION-IF-FAILURE])
 #
-AC_DEFUN([AC_TRY_KBUILD26], [
-  rm -fr conftest.dir
-  if mkdir conftest.dir; then
-  cd conftest.dir
-    cat >Makefile <<_ACEOF
+AC_DEFUN([AC_TRY_KBUILD26],[  rm -fr conftest.dir
+  if mkdir conftest.dir &&
+    cat >conftest.dir/Makefile <<_ACEOF &&
 CFLAGS += $CPPFLAGS
 
 obj-m += conftest.o
 _ACEOF
-    cat >conftest.c <<\_ACEOF
+    cat >conftest.dir/conftest.c <<\_ACEOF &&
 #include <linux/module.h>
 $1
 
@@ -21,11 +19,17 @@ $2
 
 MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
 _ACEOF
-    cd ..
-  fi
-  AS_IF(AC_RUN_LOG([make -C $LINUX_KERNEL_PATH M=`pwd`/conftest.dir modules > /dev/null]),
-      [$3], [$4])
-  rm -fr conftest.dir])
+    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],
@@ -47,3 +51,9 @@ AC_DEFUN([AC_TRY_KBUILD], [
   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([],[],:,AC_MSG_RESULT(no)
+    AC_MSG_FAILURE([Fix problem or use --disable-kernel-module...]))
+  AC_MSG_RESULT(yes)])