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 eee9a783f7d56c67dce43c29d14f3176d4aeaad1..a528e0f63c21e26be474f12e1df5090e1b5df352 100644 (file)
--- 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 93713e5a4245081d4121297727c36630c5392ca3..0297a07af34b0d8cea98f915d3767d8f62dbcf34 100755 (executable)
--- 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