diff options
| author | Richard Yao <[email protected]> | 2012-08-25 18:32:54 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-08-26 13:49:09 -0700 |
| commit | 074e72953cb3229e270e384f4dabd6d05c836060 (patch) | |
| tree | 3794671a9ab6e4af77c63bb1e3ae664b1b936fa2 | |
| parent | 9e11c7eee232b73600c2590c8c3326b2725daba5 (diff) | |
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 <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closed #896
| -rw-r--r-- | config/kernel.m4 | 7 | ||||
| -rwxr-xr-x | configure | 14 |
2 files changed, 21 insertions, 0 deletions
diff --git a/config/kernel.m4 b/config/kernel.m4 index c08b6a22c..efb408c40 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -302,6 +302,13 @@ AC_DEFUN([ZFS_AC_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], [ splsrc=`readlink -f ${sourcelink}` ], [ @@ -12306,6 +12306,13 @@ fi fi + if test -z "$sourcelink" || test ! -e $sourcelink/spl_config.h; then + + sourcelink="$LINUX" + +fi + + if test -e $sourcelink/spl_config.h; then splsrc=`readlink -f ${sourcelink}` @@ -19915,6 +19922,13 @@ fi fi + if test -z "$sourcelink" || test ! -e $sourcelink/spl_config.h; then + + sourcelink="$LINUX" + +fi + + if test -e $sourcelink/spl_config.h; then splsrc=`readlink -f ${sourcelink}` |