From 16f7f4b907cc82a409e050349fa3f260f8cd79e7 Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Fri, 29 Aug 2014 13:09:52 -0400 Subject: [PATCH] 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 --- config/kernel.m4 | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/config/kernel.m4 b/config/kernel.m4 index 2557033adc08..88435fe0d1a3 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -273,10 +273,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}"], [ @@ -290,6 +292,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]" ])