c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 10:01:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Check arch/default/ path when detecting kernel objects on SLES

Browse Source 
We still preferentially use arch/arch looking for a native version
but if that fails it is acceptable to use default.
This commit is contained in:
Brian Behlendorf 2009-07-22 06:59:28 -07:00
parent 78d6de97bd
commit 749e5eb1ed
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/spl-build.m4
View File

@ -115,8 +115,10 @@ AC_DEFUN([SPL_AC_KERNEL], [
AC_MSG_RESULT([$kernelsrc]) AC_MSG_RESULT([$kernelsrc])
AC_MSG_CHECKING([kernel build directory]) AC_MSG_CHECKING([kernel build directory])
if test -z "$kernelbuild"; then if test -z "$kernelbuild"; then
if test -d ${kernelsrc}-obj; then if test -d ${kernelsrc}-obj/`arch`/`arch`; then
kernelbuild=${kernelsrc}-obj/`arch`/`arch` 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 elif test -d `dirname ${kernelsrc}`/build-`arch`; then
kernelbuild=`dirname ${kernelsrc}`/build-`arch` kernelbuild=`dirname ${kernelsrc}`/build-`arch`
else else

8
configure vendored
View File

@ -18997,8 +18997,10 @@ echo "${ECHO_T}$kernelsrc" >&6
echo "$as_me:$LINENO: checking kernel build directory" >&5 echo "$as_me:$LINENO: checking kernel build directory" >&5
echo $ECHO_N "checking kernel build directory... $ECHO_C" >&6 echo $ECHO_N "checking kernel build directory... $ECHO_C" >&6
if test -z "$kernelbuild"; then if test -z "$kernelbuild"; then
if test -d ${kernelsrc}-obj; then if test -d ${kernelsrc}-obj/`arch`/`arch`; then
kernelbuild=${kernelsrc}-obj/`arch`/`arch` 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 elif test -d `dirname ${kernelsrc}`/build-`arch`; then
kernelbuild=`dirname ${kernelsrc}`/build-`arch` kernelbuild=`dirname ${kernelsrc}`/build-`arch`
else else
@ -21388,8 +21390,10 @@ echo "${ECHO_T}$kernelsrc" >&6
echo "$as_me:$LINENO: checking kernel build directory" >&5 echo "$as_me:$LINENO: checking kernel build directory" >&5
echo $ECHO_N "checking kernel build directory... $ECHO_C" >&6 echo $ECHO_N "checking kernel build directory... $ECHO_C" >&6
if test -z "$kernelbuild"; then if test -z "$kernelbuild"; then
if test -d ${kernelsrc}-obj; then if test -d ${kernelsrc}-obj/`arch`/`arch`; then
kernelbuild=${kernelsrc}-obj/`arch`/`arch` 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 elif test -d `dirname ${kernelsrc}`/build-`arch`; then
kernelbuild=`dirname ${kernelsrc}`/build-`arch` kernelbuild=`dirname ${kernelsrc}`/build-`arch`
else else