c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 03:09:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make configure error clearer when failing to find SPL

Browse Source 
Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Richard Yao <ryao@gentoo.org>
Closes #4251
This commit is contained in:
Olaf Faaland 2016-01-20 14:01:28 -08:00 committed by Brian Behlendorf
parent 093911f194
commit c7e7ec1997
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
config/kernel.m4
View File

@ -252,7 +252,9 @@ AC_DEFUN([ZFS_AC_SPL], [
AC_ARG_WITH([spl], AC_ARG_WITH([spl],
AS_HELP_STRING([--with-spl=PATH], AS_HELP_STRING([--with-spl=PATH],
[Path to spl source]), [Path to spl source]),
[splsrc="$withval"]) AS_IF([test "$withval" = "yes"],
AC_MSG_ERROR([--with-spl=PATH requires a PATH]),
[splsrc="$withval"]))
AC_ARG_WITH([spl-obj], AC_ARG_WITH([spl-obj],
AS_HELP_STRING([--with-spl-obj=PATH], AS_HELP_STRING([--with-spl-obj=PATH],
@ -278,6 +280,14 @@ AC_DEFUN([ZFS_AC_SPL], [
AC_MSG_CHECKING([spl source directory]) AC_MSG_CHECKING([spl source directory])
AS_IF([test -z "${splsrc}"], [ AS_IF([test -z "${splsrc}"], [
[all_spl_sources="
${splsrc0}
${splsrc1}
${splsrc2}
${splsrc3}
${splsrc4}
${splsrc5}
${splsrc6}"],
AS_IF([ test -e "${splsrc0}/spl.release.in"], [ AS_IF([ test -e "${splsrc0}/spl.release.in"], [
splsrc=${splsrc0} splsrc=${splsrc0}
], [ test -e "${splsrc1}/spl.release.in"], [ ], [ test -e "${splsrc1}/spl.release.in"], [
@ -296,6 +306,7 @@ AC_DEFUN([ZFS_AC_SPL], [
splsrc="[Not found]" splsrc="[Not found]"
]) ])
], [ ], [
[all_spl_sources="$withval"],
AS_IF([test "$splsrc" = "NONE"], [ AS_IF([test "$splsrc" = "NONE"], [
splbuild=NONE splbuild=NONE
splsrcver=NONE splsrcver=NONE
@ -307,7 +318,10 @@ AC_DEFUN([ZFS_AC_SPL], [
AC_MSG_ERROR([ AC_MSG_ERROR([
*** Please make sure the kmod spl devel package for your distribution *** Please make sure the kmod spl devel package for your distribution
*** is installed then try again. If that fails you can specify the *** is installed then try again. If that fails you can specify the
*** location of the spl source with the '--with-spl=PATH' option.]) *** location of the spl source with the '--with-spl=PATH' option.
*** The spl version must match the version of ZFS you are building,
*** ${VERSION}. Failed to find spl.release.in in the following:
$all_spl_sources])
]) ])
dnl # dnl #
@ -323,6 +337,10 @@ AC_DEFUN([ZFS_AC_SPL], [
dnl # SPL package. dnl # SPL package.
dnl # dnl #
AC_MSG_CHECKING([spl build directory]) AC_MSG_CHECKING([spl build directory])
all_spl_config_locs="${splsrc}/${LINUX_VERSION}
${splsrc}"
while true; do while true; do
AS_IF([test -z "$splbuild"], [ AS_IF([test -z "$splbuild"], [
AS_IF([ test -e "${splsrc}/${LINUX_VERSION}/spl_config.h" ], [ AS_IF([ test -e "${splsrc}/${LINUX_VERSION}/spl_config.h" ], [
@ -349,7 +367,9 @@ AC_DEFUN([ZFS_AC_SPL], [
*** Please make sure the kmod spl devel <kernel> package for your *** Please make sure the kmod spl devel <kernel> package for your
*** distribution is installed then try again. If that fails you *** distribution is installed then try again. If that fails you
*** can specify the location of the spl objects with the *** can specify the location of the spl objects with the
*** '--with-spl-obj=PATH' option.]) *** '--with-spl-obj=PATH' option. Failed to find spl_config.h in
*** any of the following:
$all_spl_config_locs])
]) ])
AC_MSG_CHECKING([spl source version]) AC_MSG_CHECKING([spl source version])