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

diff --git a/config/kernel.m4 b/config/kernel.m4
index c08b6a22c4e2184763e7407f083062fbdc1b70cd..efb408c40e56dcc0adb19588389720b6684698e0 100644 (file)
--- 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}`
                ], [

diff --git a/configure b/configure
index 83fc2a89cf96e3831f4953440e3556f340458ab1..714aaad2cc612d3dea24168c4649bc195b985a5f 100755 (executable)
--- a/configure
+++ b/configure
@@ -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}`