Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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

This commit is contained in:
Brian Behlendorf 2010-07-01 20:52:00 -07:00
parent e46b61045d bf687e1667
commit 340c43d1e6
1 changed files with 50 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
configure vendored
View File

@ -11738,32 +11738,35 @@ $as_echo "$kernelbuild" >&6; }
{ $as_echo "$as_me:$LINENO: checking kernel source version" >&5 { $as_echo "$as_me:$LINENO: checking kernel source version" >&5
$as_echo_n "checking kernel source version... " >&6; } $as_echo_n "checking kernel source version... " >&6; }
if test -r $kernelbuild/include/linux/version.h && utsrelease1=$kernelbuild/include/linux/version.h
fgrep -q UTS_RELEASE $kernelbuild/include/linux/version.h; then utsrelease2=$kernelbuild/include/linux/utsrelease.h
utsrelease3=$kernelbuild/include/generated/utsrelease.h
kernsrcver=`(echo "#include <linux/version.h>"; if test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1; then
echo "kernsrcver=UTS_RELEASE") | utsrelease=linux/version.h
cpp -I $kernelbuild/include | elif test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2; then
grep "^kernsrcver=" | cut -d \" -f 2` utsrelease=linux/utsrelease.h
elif test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3; then
elif test -r $kernelbuild/include/linux/utsrelease.h && utsrelease=generated/utsrelease.h
fgrep -q UTS_RELEASE $kernelbuild/include/linux/utsrelease.h; then
kernsrcver=`(echo "#include <linux/utsrelease.h>";
echo "kernsrcver=UTS_RELEASE") |
cpp -I $kernelbuild/include |
grep "^kernsrcver=" | cut -d \" -f 2`
fi fi
if test "$utsrelease"; then
kernsrcver=`(echo "#include <$utsrelease>";
echo "kernsrcver=UTS_RELEASE") |
cpp -I $kernelbuild/include |
grep "^kernsrcver=" | cut -d \" -f 2`
if test -z "$kernsrcver"; then if test -z "$kernsrcver"; then
{ $as_echo "$as_me:$LINENO: result: Not found" >&5 { $as_echo "$as_me:$LINENO: result: Not found" >&5
$as_echo "Not found" >&6; } $as_echo "Not found" >&6; }
{ { $as_echo "$as_me:$LINENO: error: { { $as_echo "$as_me:$LINENO: error: *** Cannot determine kernel version." >&5
*** Cannot determine the version of the linux kernel source. $as_echo "$as_me: error: *** Cannot determine kernel version." >&2;}
*** Please prepare the kernel before running this script" >&5 { (exit 1); exit 1; }; }
$as_echo "$as_me: error: fi
*** Cannot determine the version of the linux kernel source. else
*** Please prepare the kernel before running this script" >&2;} { $as_echo "$as_me:$LINENO: result: Not found" >&5
$as_echo "Not found" >&6; }
{ { $as_echo "$as_me:$LINENO: error: *** Cannot find UTS_RELEASE definition." >&5
$as_echo "$as_me: error: *** Cannot find UTS_RELEASE definition." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
@ -14560,32 +14563,35 @@ $as_echo "$kernelbuild" >&6; }
{ $as_echo "$as_me:$LINENO: checking kernel source version" >&5 { $as_echo "$as_me:$LINENO: checking kernel source version" >&5
$as_echo_n "checking kernel source version... " >&6; } $as_echo_n "checking kernel source version... " >&6; }
if test -r $kernelbuild/include/linux/version.h && utsrelease1=$kernelbuild/include/linux/version.h
fgrep -q UTS_RELEASE $kernelbuild/include/linux/version.h; then utsrelease2=$kernelbuild/include/linux/utsrelease.h
utsrelease3=$kernelbuild/include/generated/utsrelease.h
kernsrcver=`(echo "#include <linux/version.h>"; if test -r $utsrelease1 && fgrep -q UTS_RELEASE $utsrelease1; then
echo "kernsrcver=UTS_RELEASE") | utsrelease=linux/version.h
cpp -I $kernelbuild/include | elif test -r $utsrelease2 && fgrep -q UTS_RELEASE $utsrelease2; then
grep "^kernsrcver=" | cut -d \" -f 2` utsrelease=linux/utsrelease.h
elif test -r $utsrelease3 && fgrep -q UTS_RELEASE $utsrelease3; then
elif test -r $kernelbuild/include/linux/utsrelease.h && utsrelease=generated/utsrelease.h
fgrep -q UTS_RELEASE $kernelbuild/include/linux/utsrelease.h; then
kernsrcver=`(echo "#include <linux/utsrelease.h>";
echo "kernsrcver=UTS_RELEASE") |
cpp -I $kernelbuild/include |
grep "^kernsrcver=" | cut -d \" -f 2`
fi fi
if test "$utsrelease"; then
kernsrcver=`(echo "#include <$utsrelease>";
echo "kernsrcver=UTS_RELEASE") |
cpp -I $kernelbuild/include |
grep "^kernsrcver=" | cut -d \" -f 2`
if test -z "$kernsrcver"; then if test -z "$kernsrcver"; then
{ $as_echo "$as_me:$LINENO: result: Not found" >&5 { $as_echo "$as_me:$LINENO: result: Not found" >&5
$as_echo "Not found" >&6; } $as_echo "Not found" >&6; }
{ { $as_echo "$as_me:$LINENO: error: { { $as_echo "$as_me:$LINENO: error: *** Cannot determine kernel version." >&5
*** Cannot determine the version of the linux kernel source. $as_echo "$as_me: error: *** Cannot determine kernel version." >&2;}
*** Please prepare the kernel before running this script" >&5 { (exit 1); exit 1; }; }
$as_echo "$as_me: error: fi
*** Cannot determine the version of the linux kernel source. else
*** Please prepare the kernel before running this script" >&2;} { $as_echo "$as_me:$LINENO: result: Not found" >&5
$as_echo "Not found" >&6; }
{ { $as_echo "$as_me:$LINENO: error: *** Cannot find UTS_RELEASE definition." >&5
$as_echo "$as_me: error: *** Cannot find UTS_RELEASE definition." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi