Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-07-24 16:36:57 -07:00
commit be8e82d835
1 changed files with 3 additions and 1 deletions

View File

@ -79,8 +79,10 @@ AC_DEFUN([ZFS_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