Fix spl version check

The spl_config.h file is checked to determine the spl version.
However, the zfs code was looking for it in the source directory
and not the build directory.

diff --git a/config/kernel.m4 b/config/kernel.m4
index 4c06981..2d3a177 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -231,12 +231,12 @@ AC_DEFUN([ZFS_AC_SPL], [
        AC_MSG_RESULT([$splbuild])
 
        AC_MSG_CHECKING([spl source version])
-       if test -r $splsrc/spl_config.h &&
-               fgrep -q SPL_META_VERSION $splsrc/spl_config.h; then
+       if test -r $splbuild/spl_config.h &&
+               fgrep -q SPL_META_VERSION $splbuild/spl_config.h; then
 
                splsrcver=`(echo "#include <spl_config.h>";
                            echo "splsrcver=SPL_META_VERSION") |
-                           cpp -I $splsrc |
+                           cpp -I $splbuild |
                            grep "^splsrcver=" | cut -d \" -f 2`
        fi
 

diff --git a/configure b/configure
index 800221a..b10a240 100755 (executable)
--- a/configure
+++ b/configure
@@ -12047,12 +12047,12 @@ $as_echo "$splbuild" >&6; }
 
        { $as_echo "$as_me:$LINENO: checking spl source version" >&5
 $as_echo_n "checking spl source version... " >&6; }
-       if test -r $splsrc/spl_config.h &&
-               fgrep -q SPL_META_VERSION $splsrc/spl_config.h; then
+       if test -r $splbuild/spl_config.h &&
+               fgrep -q SPL_META_VERSION $splbuild/spl_config.h; then
 
                splsrcver=`(echo "#include <spl_config.h>";
                            echo "splsrcver=SPL_META_VERSION") |
-                           cpp -I $splsrc |
+                           cpp -I $splbuild |
                            grep "^splsrcver=" | cut -d \" -f 2`
        fi
 
@@ -15053,12 +15053,12 @@ $as_echo "$splbuild" >&6; }
 
        { $as_echo "$as_me:$LINENO: checking spl source version" >&5
 $as_echo_n "checking spl source version... " >&6; }
-       if test -r $splsrc/spl_config.h &&
-               fgrep -q SPL_META_VERSION $splsrc/spl_config.h; then
+       if test -r $splbuild/spl_config.h &&
+               fgrep -q SPL_META_VERSION $splbuild/spl_config.h; then
 
                splsrcver=`(echo "#include <spl_config.h>";
                            echo "splsrcver=SPL_META_VERSION") |
-                           cpp -I $splsrc |
+                           cpp -I $splbuild |
                            grep "^splsrcver=" | cut -d \" -f 2`
        fi