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

This commit is contained in:
Brian Behlendorf 2010-03-08 15:05:54 -08:00
commit 18d18530c4
1 changed files with 16 additions and 4 deletions

20
configure vendored
View File

@ -19027,8 +19027,14 @@ fi;
echo "$as_me:$LINENO: checking kernel source directory" >&5 echo "$as_me:$LINENO: checking kernel source directory" >&5
echo $ECHO_N "checking kernel source directory... $ECHO_C" >&6 echo $ECHO_N "checking kernel source directory... $ECHO_C" >&6
if test -z "$kernelsrc"; then if test -z "$kernelsrc"; then
sourcelink=`ls -1d /usr/src/kernels/* /usr/src/linux-* \ headersdir="/lib/modules/$(uname -r)/build"
2>/dev/null | grep -v obj | tail -1` if test -e "$headersdir"; then
sourcelink=$(readlink -f "$headersdir")
else
sourcelink=$(ls -1d /usr/src/kernels/* \
/usr/src/linux-* \
2>/dev/null | grep -v obj | tail -1)
fi
if test -e $sourcelink; then if test -e $sourcelink; then
kernelsrc=`readlink -f ${sourcelink}` kernelsrc=`readlink -f ${sourcelink}`
@ -21738,8 +21744,14 @@ fi;
echo "$as_me:$LINENO: checking kernel source directory" >&5 echo "$as_me:$LINENO: checking kernel source directory" >&5
echo $ECHO_N "checking kernel source directory... $ECHO_C" >&6 echo $ECHO_N "checking kernel source directory... $ECHO_C" >&6
if test -z "$kernelsrc"; then if test -z "$kernelsrc"; then
sourcelink=`ls -1d /usr/src/kernels/* /usr/src/linux-* \ headersdir="/lib/modules/$(uname -r)/build"
2>/dev/null | grep -v obj | tail -1` if test -e "$headersdir"; then
sourcelink=$(readlink -f "$headersdir")
else
sourcelink=$(ls -1d /usr/src/kernels/* \
/usr/src/linux-* \
2>/dev/null | grep -v obj | tail -1)
fi
if test -e $sourcelink; then if test -e $sourcelink; then
kernelsrc=`readlink -f ${sourcelink}` kernelsrc=`readlink -f ${sourcelink}`