diff --git a/CHANGES b/CHANGES index 689be50..0e3e4aa 100644 --- a/CHANGES +++ b/CHANGES @@ -42,6 +42,8 @@ * * -------------------------------------------------------------------- 0.1.14 + - Added PCMCIA ident info for the 3Com AirConnect 3CRW737A/3CRW777A + - David Everly's patch to kernel detection in the Configure script -pre7 - Added kernel tags stuff. - Added PCMCIA ident info for the Actiontec 802CI2 card. diff --git a/Configure b/Configure index 62ffbb6..62c04d6 100755 --- a/Configure +++ b/Configure @@ -275,7 +275,7 @@ $ECHO "" ask_str "Linux source directory" LINUX_SRC -if [ ! -f $LINUX_SRC/Makefile ] ; then +if [ ! -f $LINUX_SRC/include/linux/version.h ] ; then $ECHO "Linux source tree $LINUX_SRC is incomplete or missing!" if [ -d $LINUX_SRC/include/linux ] ; then $ECHO " The kernel header files are present, but not " \ @@ -293,11 +293,13 @@ version () { } $ECHO "" -for TAG in VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION ; do - eval `sed -ne "/^$TAG/s/[ ]//gp" $LINUX_SRC/Makefile` -done -SRC_RELEASE=$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION -VERSION_CODE=`version $VERSION $PATCHLEVEL $SUBLEVEL` + +SRC_RELEASE=`grep UTS_RELEASE $LINUX_SRC/include/linux/version.h | \ + sed -e 's/^[^"]*"//g' -e 's/".*$//g'` + +VERSION_CODE=`grep LINUX_VERSION_CODE $LINUX_SRC/include/linux/version.h | \ + sed -e 's/[^0-9]//g'` + $ECHO "The kernel source tree is version $SRC_RELEASE." if [ $VERSION_CODE -lt `version 2 2 0` ] ; then $ECHO "This package requires at least a 2.2.x series kernel." diff --git a/config.in b/config.in index 1dfe4f1..6c88006 100644 --- a/config.in +++ b/config.in @@ -1,7 +1,7 @@ WLAN_VERSION=0 WLAN_PATCHLEVEL=1 WLAN_SUBLEVEL=14 -WLAN_EXTRAVERSION=-pre7 +WLAN_EXTRAVERSION= LINUX_SRC=/usr/src/linux WLAN_TARGET_ARCH= PCMCIA_SRC=