diff options
| author | Brian Behlendorf <[email protected]> | 2014-10-03 10:58:47 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-10-17 14:58:38 -0700 |
| commit | e33045ee98611b30bbe2f174a709f470f9201171 (patch) | |
| tree | 822ab75d5c02024e5c69038882338134a23cb06f /config/kernel.m4 | |
| parent | e82cdc3acc4afe52c3ddc3fe9e4f456fdef80f41 (diff) | |
Make license compatibility checks consistent
Apply the license specified in the META file to ensure the
compatibility checks are all performed consistently.
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #2757
Diffstat (limited to 'config/kernel.m4')
| -rw-r--r-- | config/kernel.m4 | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/config/kernel.m4 b/config/kernel.m4 index 67a4ef6d2..909415fd3 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -420,8 +420,8 @@ AC_DEFUN([ZFS_AC_SPL], [ dnl # dnl # Basic toolchain sanity check. dnl # -AC_DEFUN([ZFS_AC_TEST_MODULE], - [AC_MSG_CHECKING([whether modules can be built]) +AC_DEFUN([ZFS_AC_TEST_MODULE], [ + AC_MSG_CHECKING([whether modules can be built]) ZFS_LINUX_TRY_COMPILE([],[],[ AC_MSG_RESULT([yes]) ],[ @@ -442,10 +442,16 @@ dnl # detected at configure time and cause a build failure. Otherwise dnl # modules may be successfully built that behave incorrectly. dnl # AC_DEFUN([ZFS_AC_KERNEL_CONFIG], [ - - AS_IF([test "$ZFS_META_LICENSE" = GPL], [ - AC_DEFINE([HAVE_GPL_ONLY_SYMBOLS], [1], - [Define to 1 if licensed under the GPL]) + AC_RUN_IFELSE([ + AC_LANG_PROGRAM([ + #include "$LINUX/include/linux/license.h" + ], [ + return !license_is_gpl_compatible("$ZFS_META_LICENSE"); + ]) + ], [ + AC_DEFINE([ZFS_IS_GPL_COMPATIBLE], [1], + [Define to 1 if GPL-only symbols can be used]) + ], [ ]) ZFS_AC_KERNEL_CONFIG_DEBUG_LOCK_ALLOC |