Permalink
Browse files

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
  • Loading branch information...
1 parent 9e11c7e commit 074e72953cb3229e270e384f4dabd6d05c836060 @ryao ryao committed with Aug 25, 2012
Showing with 21 additions and 0 deletions.
  1. +7 −0 config/kernel.m4
  2. +14 −0 configure
View
@@ -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}`
], [
View
@@ -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}`

0 comments on commit 074e729

Please sign in to comment.