diff options
| author | Richard Yao <[email protected]> | 2014-08-29 13:09:52 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-10-28 09:37:23 -0700 |
| commit | d8d78267214b17ffa5f1f0ae0695d69bb8d6b767 (patch) | |
| tree | 5d56c446cf42cd230ca9608f6cd46997bf678324 | |
| parent | 3cd33ffc3ba1ebbc90eab280d87d6ac096be92f9 (diff) | |
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 <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #2641
| -rw-r--r-- | config/kernel.m4 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/config/kernel.m4 b/config/kernel.m4 index 909415fd3..9145dbd89 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -272,10 +272,12 @@ AC_DEFUN([ZFS_AC_SPL], [ dnl # source directory. In order of preference: dnl # splsrc0="/var/lib/dkms/spl/${VERSION}/build" - splsrc1="/usr/src/spl-${VERSION}/${LINUX_VERSION}" - splsrc2="/usr/src/spl-${VERSION}" - splsrc3="../spl/" - splsrc4="$LINUX" + splsrc1="/usr/local/src/spl-${VERSION}/${LINUX_VERSION}" + splsrc2="/usr/local/src/spl-${VERSION}" + splsrc3="/usr/src/spl-${VERSION}/${LINUX_VERSION}" + splsrc4="/usr/src/spl-${VERSION}" + splsrc5="../spl/" + splsrc6="$LINUX" AC_MSG_CHECKING([spl source directory]) AS_IF([test -z "${splsrc}"], [ @@ -289,6 +291,10 @@ AC_DEFUN([ZFS_AC_SPL], [ splsrc=$(readlink -f "${splsrc3}") ], [ test -e "${splsrc4}/spl.release.in" ], [ splsrc=${splsrc4} + ], [ test -e "${splsrc5}/spl.release.in"], [ + splsrc=$(readlink -f "${splsrc5}") + ], [ test -e "${splsrc6}/spl.release.in" ], [ + splsrc=${splsrc6} ], [ splsrc="[Not found]" ]) |