From cac1f230e0537ceddead464dbd140e23a0556be6 Mon Sep 17 00:00:00 2001 From: Ned Bass Date: Tue, 5 Jun 2012 12:45:37 -0700 Subject: [PATCH] Improve CONFIG_DEBUG_LOCK_ALLOC error message The configure script error message for kernels built with CONFIG_DEBUG_LOCK_ALLOC may give the impression that the issue is strictly with license compliance. To avoid confusion add some words indicating that the linking stage will fail if the build continues. Signed-off-by: Brian Behlendorf Closes #773 --- config/kernel.m4 | 5 +++-- configure | 20 ++++++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/config/kernel.m4 b/config/kernel.m4 index 0f61000..9e4ac11 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -374,8 +374,9 @@ AC_DEFUN([ZFS_AC_KERNEL_CONFIG_DEBUG_LOCK_ALLOC], [ AC_MSG_RESULT(yes) AC_MSG_ERROR([ *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible - *** with the CDDL license. You must rebuild your kernel without - *** this option enabled.]) + *** with the CDDL license and will prevent the module linking stage + *** from succeeding. You must rebuild your kernel without this + *** option enabled.]) ]) EXTRA_KCFLAGS="$tmp_flags" ], []) diff --git a/configure b/configure index 9bcc551..a8e7cb7 100755 --- a/configure +++ b/configure @@ -12587,12 +12587,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 $as_echo "yes" >&6; } { { $as_echo "$as_me:$LINENO: error: *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible - *** with the CDDL license. You must rebuild your kernel without - *** this option enabled." >&5 + *** with the CDDL license and will prevent the module linking stage + *** from succeeding. You must rebuild your kernel without this + *** option enabled." >&5 $as_echo "$as_me: error: *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible - *** with the CDDL license. You must rebuild your kernel without - *** this option enabled." >&2;} + *** with the CDDL license and will prevent the module linking stage + *** from succeeding. You must rebuild your kernel without this + *** option enabled." >&2;} { (exit 1); exit 1; }; } @@ -18680,12 +18682,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 $as_echo "yes" >&6; } { { $as_echo "$as_me:$LINENO: error: *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible - *** with the CDDL license. You must rebuild your kernel without - *** this option enabled." >&5 + *** with the CDDL license and will prevent the module linking stage + *** from succeeding. You must rebuild your kernel without this + *** option enabled." >&5 $as_echo "$as_me: error: *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is incompatible - *** with the CDDL license. You must rebuild your kernel without - *** this option enabled." >&2;} + *** with the CDDL license and will prevent the module linking stage + *** from succeeding. You must rebuild your kernel without this + *** option enabled." >&2;} { (exit 1); exit 1; }; } -- 1.8.3.1