From 749e5eb1edaa86b60e3b0c925a587925873ec560 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 22 Jul 2009 06:59:28 -0700 Subject: [PATCH] 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. --- config/spl-build.m4 | 4 +++- configure | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/config/spl-build.m4 b/config/spl-build.m4 index eee9a78..a528e0f 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 93713e5..0297a07 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 -- 2.39.5