From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Wed, 22 Jul 2009 13:59:28 +0000 (-0700)
Subject: Check arch/default/ path when detecting kernel objects on SLES
X-Git-Tag: zfs-0.8.0-rc1~152^2~677
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=749e5eb1edaa86b60e3b0c925a587925873ec560;p=zfs

Check arch/default/ path when detecting kernel objects on SLES
We still preferentially use arch/arch looking for a native version
but if that fails it is acceptable to use default.
---

diff --git a/config/spl-build.m4 b/config/spl-build.m4
index eee9a783f..a528e0f63 100644
--- a/config/spl-build.m4
+++ b/config/spl-build.m4
@@ -115,8 +115,10 @@ AC_DEFUN([SPL_AC_KERNEL], [
 	AC_MSG_RESULT([$kernelsrc])
 	AC_MSG_CHECKING([kernel build directory])
 	if test -z "$kernelbuild"; then
-		if test -d ${kernelsrc}-obj; then
+		if test -d ${kernelsrc}-obj/`arch`/`arch`; then
 			kernelbuild=${kernelsrc}-obj/`arch`/`arch`
+		elif test -d ${kernelsrc}-obj/`arch`/default; then
+			kernelbuild=${kernelsrc}-obj/`arch`/default
 		elif test -d `dirname ${kernelsrc}`/build-`arch`; then
 			kernelbuild=`dirname ${kernelsrc}`/build-`arch`
 		else
diff --git a/configure b/configure
index 93713e5a4..0297a07af 100755
--- a/configure
+++ b/configure
@@ -18997,8 +18997,10 @@ echo "${ECHO_T}$kernelsrc" >&6
 	echo "$as_me:$LINENO: checking kernel build directory" >&5
 echo $ECHO_N "checking kernel build directory... $ECHO_C" >&6
 	if test -z "$kernelbuild"; then
-		if test -d ${kernelsrc}-obj; then
+		if test -d ${kernelsrc}-obj/`arch`/`arch`; then
 			kernelbuild=${kernelsrc}-obj/`arch`/`arch`
+		elif test -d ${kernelsrc}-obj/`arch`/default; then
+			kernelbuild=${kernelsrc}-obj/`arch`/default
 		elif test -d `dirname ${kernelsrc}`/build-`arch`; then
 			kernelbuild=`dirname ${kernelsrc}`/build-`arch`
 		else
@@ -21388,8 +21390,10 @@ echo "${ECHO_T}$kernelsrc" >&6
 	echo "$as_me:$LINENO: checking kernel build directory" >&5
 echo $ECHO_N "checking kernel build directory... $ECHO_C" >&6
 	if test -z "$kernelbuild"; then
-		if test -d ${kernelsrc}-obj; then
+		if test -d ${kernelsrc}-obj/`arch`/`arch`; then
 			kernelbuild=${kernelsrc}-obj/`arch`/`arch`
+		elif test -d ${kernelsrc}-obj/`arch`/default; then
+			kernelbuild=${kernelsrc}-obj/`arch`/default
 		elif test -d `dirname ${kernelsrc}`/build-`arch`; then
 			kernelbuild=`dirname ${kernelsrc}`/build-`arch`
 		else