c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 03:09:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix spl version check

Browse Source 
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.
This commit is contained in:
Brian Behlendorf 2010-09-02 20:44:41 -07:00
parent 8160dd9a74
commit 5e6121455c
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/kernel.m4
View File

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

12
configure vendored
View File

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