Changeset 9024

Show
Ignore:
Timestamp:
08/23/11 14:41:16 (21 months ago)
Author:
mtmoore
Message:

configure change to support 3.X kernel series

Location:
branches/Orange-Branch
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/Orange-Branch/configure

    r9022 r9024  
    57855785    elif test -r  $withval/include/generated/utsrelease.h && grep -q UTS_RELEASE..2\\.6\\. $withval/include/generated/utsrelease.h; then 
    57865786        vers=`sed -n '/UTS_RELEASE/{; s/.*"\(0-9\.0-9\).*".*/\1/; p; }' $withval/include/generated/utsrelease.h` 
     5787    elif test -r  $withval/include/generated/utsrelease.h && grep -qE UTS_RELEASE..3\\. $withval/include/generated/utsrelease.h; then 
     5788        vers=`sed -n '/UTS_RELEASE/{; s/.*"\(0-9\.0-9\).*".*/\1/; p; }' $withval/include/generated/utsrelease.h` 
    57875789    else 
    5788         as_fn_error $? "The kernel source tree does not appear to be 2.6" "$LINENO" 5 
     5790        as_fn_error $? "The kernel source tree does not appear to be 2.6 or 3.X" "$LINENO" 5 
     5791 
    57895792    fi 
    57905793 
    … …  
    1315813161 
    1315913162if test "x$LINUX_KERNEL_SRC" = "x" -a "x$BUILD_BMI_ONLY" != "x1"; then 
    13160    { $as_echo "$as_me:${as_lineno-$LINENO}: result: PVFS2 configured for the 2.6.x kernel module      :  no" >&5 
    13161 $as_echo "PVFS2 configured for the 2.6.x kernel module      :  no" >&6; } 
    13162 else 
    13163    { $as_echo "$as_me:${as_lineno-$LINENO}: result: PVFS2 configured for the 2.6.x kernel module      : yes" >&5 
    13164 $as_echo "PVFS2 configured for the 2.6.x kernel module      : yes" >&6; } 
     13163   { $as_echo "$as_me:${as_lineno-$LINENO}: result: PVFS2 configured for the 2.6/3 kernel module      :  no" >&5 
     13164$as_echo "PVFS2 configured for the 2.6/3 kernel module      :  no" >&6; } 
     13165else 
     13166   { $as_echo "$as_me:${as_lineno-$LINENO}: result: PVFS2 configured for the 2.6/3 kernel module      : yes" >&5 
     13167$as_echo "PVFS2 configured for the 2.6/3 kernel module      : yes" >&6; } 
    1316513168fi 
    1316613169 

  • branches/Orange-Branch/configure.in

    r8794 r9024  
    534534    elif test -r  $withval/include/generated/utsrelease.h && grep -q UTS_RELEASE..2\\.6\\. $withval/include/generated/utsrelease.h; then 
    535535        vers=`sed -n '/UTS_RELEASE/{; s/.*"\([0-9]\.[0-9]\).*".*/\1/; p; }' $withval/include/generated/utsrelease.h` 
     536    elif test -r  $withval/include/generated/utsrelease.h && grep -qE UTS_RELEASE..3\\. $withval/include/generated/utsrelease.h; then 
     537        vers=`sed -n '/UTS_RELEASE/{; s/.*"\([0-9]\.[0-9]\).*".*/\1/; p; }' $withval/include/generated/utsrelease.h` 
    536538    else 
    537         AC_MSG_ERROR(The kernel source tree does not appear to be 2.6) 
     539        AC_MSG_ERROR(The kernel source tree does not appear to be 2.6 or 3.X) 
     540         
    538541    fi 
    539542 
    … …  
    12251228 
    12261229if test "x$LINUX_KERNEL_SRC" = "x" -a "x$BUILD_BMI_ONLY" != "x1"; then 
    1227    AC_MSG_RESULT([PVFS2 configured for the 2.6.x kernel module      :  no]) 
    1228 else 
    1229    AC_MSG_RESULT([PVFS2 configured for the 2.6.x kernel module      : yes]) 
     1230   AC_MSG_RESULT([PVFS2 configured for the 2.6/3 kernel module      :  no]) 
     1231else 
     1232   AC_MSG_RESULT([PVFS2 configured for the 2.6/3 kernel module      : yes]) 
    12301233fi 
    12311234