Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Search /usr/local/src for SPL Object Directory 

Since we changed the default location for the kernel headers to respect
--prefix in the SPL, we must search that location to prevent user builds
from breaking.

Signed-off-by: Richard Yao <richard.yao@clusterhq.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #2641
This commit is contained in:
Richard Yao 2014-08-29 13:09:52 -04:00 committed by Brian Behlendorf
parent 3cd33ffc3b
commit d8d7826721
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/kernel.m4
View File

@ -272,10 +272,12 @@ AC_DEFUN([ZFS_AC_SPL], [
dnl # source directory. In order of preference: dnl # source directory. In order of preference:
dnl # dnl #
splsrc0="/var/lib/dkms/spl/${VERSION}/build" splsrc0="/var/lib/dkms/spl/${VERSION}/build"
splsrc1="/usr/src/spl-${VERSION}/${LINUX_VERSION}" splsrc1="/usr/local/src/spl-${VERSION}/${LINUX_VERSION}"
splsrc2="/usr/src/spl-${VERSION}" splsrc2="/usr/local/src/spl-${VERSION}"
splsrc3="../spl/" splsrc3="/usr/src/spl-${VERSION}/${LINUX_VERSION}"
splsrc4="$LINUX" splsrc4="/usr/src/spl-${VERSION}"
splsrc5="../spl/"
splsrc6="$LINUX"
AC_MSG_CHECKING([spl source directory]) AC_MSG_CHECKING([spl source directory])
AS_IF([test -z "${splsrc}"], [ AS_IF([test -z "${splsrc}"], [
@ -289,6 +291,10 @@ AC_DEFUN([ZFS_AC_SPL], [
splsrc=$(readlink -f "${splsrc3}") splsrc=$(readlink -f "${splsrc3}")
], [ test -e "${splsrc4}/spl.release.in" ], [ ], [ test -e "${splsrc4}/spl.release.in" ], [
splsrc=${splsrc4} splsrc=${splsrc4}
], [ test -e "${splsrc5}/spl.release.in"], [
splsrc=$(readlink -f "${splsrc5}")
], [ test -e "${splsrc6}/spl.release.in" ], [
splsrc=${splsrc6}
], [ ], [
splsrc="[Not found]" splsrc="[Not found]"
]) ])