aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrakash Surya <[email protected]>2011-08-24 09:23:44 -0700
committerBrian Behlendorf <[email protected]>2011-09-06 13:20:04 -0700
commit2984e0bb0c1dd3b96166b4c3ab99771e8712f686 (patch)
tree3cb2eaaaa89edea41c4a8e28620fe52e952dabc8
parent1a2e6a635f9ca259c687d062a133fb972c5d84c5 (diff)
Fix minor autoconf error message inconsistencies
A few of the autoconf error messages were inconsistent with the rest of the build system. To be specific, the inconsistencies addressed by this commit are the following: * The second line of the error message for the CONFIG_PREEMPT check was missing it's third asterisk. * A few of the error messages were prefixed by two tabs, whereas the majority of error messages are only prefixed by a single tab. Signed-off-by: Prakash Surya <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]>
-rw-r--r--config/kernel.m414
-rwxr-xr-xconfigure56
2 files changed, 35 insertions, 35 deletions
diff --git a/config/kernel.m4 b/config/kernel.m4
index 87c49a82c..79a49689d 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -272,8 +272,8 @@ AC_DEFUN([ZFS_AC_SPL], [
if test -z "$splsrcver"; then
AC_MSG_RESULT([Not found])
AC_MSG_ERROR([
- *** Cannot determine the version of the spl source.
- *** Please prepare the spl source before running this script])
+ *** Cannot determine the version of the spl source.
+ *** Please prepare the spl source before running this script])
fi
AC_MSG_RESULT([$splsrcver])
@@ -307,15 +307,15 @@ AC_DEFUN([ZFS_AC_KERNEL_CONFIG], [
ZFS_LINUX_CONFIG([PREEMPT],
AC_MSG_ERROR([
- *** Kernel built with CONFIG_PREEMPT which is not supported.
- ** You must rebuild your kernel without this option.]), [])
+ *** Kernel built with CONFIG_PREEMPT which is not supported.
+ *** You must rebuild your kernel without this option.]), [])
if test "$ZFS_META_LICENSE" = CDDL; then
ZFS_LINUX_CONFIG([DEBUG_LOCK_ALLOC],
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.]), [])
+ *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is
+ *** incompatible with the CDDL license. You must rebuild
+ *** your kernel without this option.]), [])
fi
if test "$ZFS_META_LICENSE" = GPL; then
diff --git a/configure b/configure
index d97d1caca..4cf8c545b 100755
--- a/configure
+++ b/configure
@@ -12186,11 +12186,11 @@ $as_echo_n "checking spl source version... " >&6; }
{ $as_echo "$as_me:$LINENO: result: Not found" >&5
$as_echo "Not found" >&6; }
{ { $as_echo "$as_me:$LINENO: error:
- *** Cannot determine the version of the spl source.
- *** Please prepare the spl source before running this script" >&5
+ *** Cannot determine the version of the spl source.
+ *** Please prepare the spl source before running this script" >&5
$as_echo "$as_me: error:
- *** Cannot determine the version of the spl source.
- *** Please prepare the spl source before running this script" >&2;}
+ *** Cannot determine the version of the spl source.
+ *** Please prepare the spl source before running this script" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -12273,11 +12273,11 @@ _ACEOF
{ $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
{ { $as_echo "$as_me:$LINENO: error:
- *** Kernel built with CONFIG_PREEMPT which is not supported.
- ** You must rebuild your kernel without this option." >&5
+ *** Kernel built with CONFIG_PREEMPT which is not supported.
+ *** You must rebuild your kernel without this option." >&5
$as_echo "$as_me: error:
- *** Kernel built with CONFIG_PREEMPT which is not supported.
- ** You must rebuild your kernel without this option." >&2;}
+ *** Kernel built with CONFIG_PREEMPT which is not supported.
+ *** You must rebuild your kernel without this option." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -12344,13 +12344,13 @@ _ACEOF
{ $as_echo "$as_me:$LINENO: result: yes" >&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." >&5
+ *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is
+ *** incompatible with the CDDL license. You must rebuild
+ *** your kernel without this option." >&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." >&2;}
+ *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is
+ *** incompatible with the CDDL license. You must rebuild
+ *** your kernel without this option." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -16544,11 +16544,11 @@ $as_echo_n "checking spl source version... " >&6; }
{ $as_echo "$as_me:$LINENO: result: Not found" >&5
$as_echo "Not found" >&6; }
{ { $as_echo "$as_me:$LINENO: error:
- *** Cannot determine the version of the spl source.
- *** Please prepare the spl source before running this script" >&5
+ *** Cannot determine the version of the spl source.
+ *** Please prepare the spl source before running this script" >&5
$as_echo "$as_me: error:
- *** Cannot determine the version of the spl source.
- *** Please prepare the spl source before running this script" >&2;}
+ *** Cannot determine the version of the spl source.
+ *** Please prepare the spl source before running this script" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -16631,11 +16631,11 @@ _ACEOF
{ $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
{ { $as_echo "$as_me:$LINENO: error:
- *** Kernel built with CONFIG_PREEMPT which is not supported.
- ** You must rebuild your kernel without this option." >&5
+ *** Kernel built with CONFIG_PREEMPT which is not supported.
+ *** You must rebuild your kernel without this option." >&5
$as_echo "$as_me: error:
- *** Kernel built with CONFIG_PREEMPT which is not supported.
- ** You must rebuild your kernel without this option." >&2;}
+ *** Kernel built with CONFIG_PREEMPT which is not supported.
+ *** You must rebuild your kernel without this option." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -16702,13 +16702,13 @@ _ACEOF
{ $as_echo "$as_me:$LINENO: result: yes" >&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." >&5
+ *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is
+ *** incompatible with the CDDL license. You must rebuild
+ *** your kernel without this option." >&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." >&2;}
+ *** Kernel built with CONFIG_DEBUG_LOCK_ALLOC which is
+ *** incompatible with the CDDL license. You must rebuild
+ *** your kernel without this option." >&2;}
{ (exit 1); exit 1; }; }
else