diff options
| author | Brian Behlendorf <[email protected]> | 2011-07-22 14:10:38 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2011-07-22 15:07:16 -0700 |
| commit | 0da78696904f6e0e7cfedd2a0296879f47717f4f (patch) | |
| tree | a00f5e6c6fbce5ba0c2ef69fc59953c2e58c7308 /config | |
| parent | 22872ff5da0d12fe393e40d3e4b3c5a58d93e360 (diff) | |
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 <[email protected]>
Closes #320
Diffstat (limited to 'config')
| -rw-r--r-- | config/kernel.m4 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config/kernel.m4 b/config/kernel.m4 index 90dc6c000..5eaa4d879 100644 --- 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 |