Fix the configure CONFIG_* option detection

The latest kernels no longer define AUTOCONF_INCLUDED which was
being used to detect the new style autoconf.h kernel configure
options.  This results in the CONFIG_* checks always failing
incorrectly for newer kernels.

The fix for this is a simplification of the testing method.
Rather than attempting to explicitly include to renamed config
header.  It is simpler to unconditionally include <linux/module.h>
which must pick up the correctly named header.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #320

diff --git a/config/kernel.m4 b/config/kernel.m4
index 90dc6c0..5eaa4d8 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -380,9 +380,7 @@ dnl #
 AC_DEFUN([ZFS_LINUX_CONFIG],
        [AC_MSG_CHECKING([whether Linux was built with CONFIG_$1])
        ZFS_LINUX_TRY_COMPILE([
-               #ifndef AUTOCONF_INCLUDED
-               #include <linux/config.h>
-               #endif
+               #include <linux/module.h>
        ],[
                #ifndef CONFIG_$1
                #error CONFIG_$1 not #defined

diff --git a/configure b/configure
index 381e22d..cb17d5c 100755 (executable)
--- a/configure
+++ b/configure
@@ -12233,9 +12233,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
-               #ifndef AUTOCONF_INCLUDED
-               #include <linux/config.h>
-               #endif
+               #include <linux/module.h>
 
 int
 main (void)
@@ -12306,9 +12304,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
-               #ifndef AUTOCONF_INCLUDED
-               #include <linux/config.h>
-               #endif
+               #include <linux/module.h>
 
 int
 main (void)
@@ -16507,9 +16503,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
-               #ifndef AUTOCONF_INCLUDED
-               #include <linux/config.h>
-               #endif
+               #include <linux/module.h>
 
 int
 main (void)
@@ -16580,9 +16574,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
-               #ifndef AUTOCONF_INCLUDED
-               #include <linux/config.h>
-               #endif
+               #include <linux/module.h>
 
 int
 main (void)