Merge commit 'refs/top-bases/top' into top

This commit is contained in:
Brian Behlendorf 2009-07-24 16:39:57 -07:00
commit 11f585bfcf
1 changed files with 6 additions and 2 deletions

8
configure vendored
View File

@ -19035,8 +19035,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
@ -19987,8 +19989,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