Index: /trunk/configure
===================================================================
--- /trunk/configure	(revision 70496)
+++ /trunk/configure	(revision 70497)
@@ -1767,29 +1767,5 @@
   else
     if test_execute; then
-      cat > $ODIR.tmp_src.c << EOF
-#include <linux/version.h>
-int printf(const char *format, ...);
-int main(void)
-{
-  return LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) ? 1 : 0;
-}
-EOF
-      echo "compiling the following source file:" >> $LOG
-      cat $ODIR.tmp_src.c >> $LOG
-      echo "using the following command line:" >> $LOG
-      echo "$CC -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.c -nostdinc -I$LINUX/include " \
-          "-I$LINUX/include/generated/uapi" >> $LOG
-      $CC -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.c -nostdinc -I$LINUX/include \
-          -I$LINUX/include/generated/uapi >> $LOG 2>&1
-      if [ $? -eq 0 ]; then
-        $ODIR.tmp_out
-        if [ $? -ne 0 ]; then
-          cnf_append "VBOX_WITH_VBOXDRV" ""
-          cnf_append "VBOX_WITH_ADDITION_DRIVERS" ""
-          echo "Detected Linux >= 4.8 -- disabling compiling of Linux kernel modules."
-        else
-          cnf_append "VBOX_LINUX_SRC" "`cd $LINUX ; pwd`"
-        fi
-      fi
+      cnf_append "VBOX_LINUX_SRC" "`cd $LINUX ; pwd`"
     fi
   fi
@@ -2823,6 +2799,5 @@
   else
     cnf_append "VBOX_LINUX_SRC" ""
-    cnf_append "VBOX_WITH_VBOXDRV" ""
-    cnf_append "VBOX_WITH_ADDITION_DRIVERS" ""
+    cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"
   fi
   if [ $ONLY_ADDITIONS -eq 0 ]; then