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

Check kernel source directory for SPL 

ZFS fails to build when SPL is built into the kernel on unless
--with-spl=/path/to/kernel/sources is specified. We fallback to the
kernel sources directory when SPL is not found elsewhere to resolve
that.

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closed #896
This commit is contained in:
Richard Yao 2012-08-25 18:32:54 -04:00 committed by Brian Behlendorf
parent 9e11c7eee2
commit 074e72953c
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/kernel.m4
View File

@ -302,6 +302,13 @@ AC_DEFUN([ZFS_AC_SPL], [
sourcelink=../spl sourcelink=../spl
]) ])
dnl #
dnl # Look in the kernel directory
dnl #
AS_IF([test -z "$sourcelink" || test ! -e $sourcelink/spl_config.h], [
sourcelink="$LINUX"
])
AS_IF([test -e $sourcelink/spl_config.h], [ AS_IF([test -e $sourcelink/spl_config.h], [
splsrc=`readlink -f ${sourcelink}` splsrc=`readlink -f ${sourcelink}`
], [ ], [

14
configure vendored
View File

@ -12306,6 +12306,13 @@ fi
fi fi
if test -z "$sourcelink" || test ! -e $sourcelink/spl_config.h; then
sourcelink="$LINUX"
fi
if test -e $sourcelink/spl_config.h; then if test -e $sourcelink/spl_config.h; then
splsrc=`readlink -f ${sourcelink}` splsrc=`readlink -f ${sourcelink}`
@ -19915,6 +19922,13 @@ fi
fi fi
if test -z "$sourcelink" || test ! -e $sourcelink/spl_config.h; then
sourcelink="$LINUX"
fi
if test -e $sourcelink/spl_config.h; then if test -e $sourcelink/spl_config.h; then
splsrc=`readlink -f ${sourcelink}` splsrc=`readlink -f ${sourcelink}`