Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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 <surya1@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Prakash Surya 2011-08-24 09:23:44 -07:00 committed by Brian Behlendorf
parent 1a2e6a635f
commit 2984e0bb0c
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/kernel.m4
View File

@ -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

56
configure vendored
View File

@ -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