diff -r bc89e3fba1a5 -r 5fcbd29151d2 configure.ac --- a/configure.ac Tue Feb 13 13:36:31 2007 +0000 +++ b/configure.ac Tue Feb 13 13:42:37 2007 +0000 @@ -3,7 +3,7 @@ #------------------------------------------------------------------------------ AC_PREREQ(2.59) -AC_INIT([ethercat],[1.1.1],[fp@igh-essen.com]) +AC_INIT([ethercat],[1.2.0-rc2],[fp@igh-essen.com]) AC_CONFIG_AUX_DIR([autoconf]) AM_INIT_AUTOMAKE([-Wall -Werror dist-bzip2]) AC_PREFIX_DEFAULT([/opt/etherlab]) @@ -50,10 +50,15 @@ fi # Try to get kernel release string -if test -r ${sourcedir}/.kernelrelease; then +if test -r ${sourcedir}/include/config/kernel.release; then + kernelrelease=`cat $sourcedir/include/config/kernel.release` +elif test -r ${sourcedir}/.kernelrelease; then kernelrelease=`cat $sourcedir/.kernelrelease` +elif test -r ${sourcedir}/include/linux/utsrelease.h; then + hdr=${sourcedir}/include/linux/utsrelease.h + kernelrelease=`grep UTS_RELEASE $hdr | cut -d " " -f 3- | tr -d \"` elif test -r ${sourcedir}/include/linux/version.h; then - hdr=$sourcedir/include/linux/version.h + hdr=${sourcedir}/include/linux/version.h kernelrelease=`grep UTS_RELEASE $hdr | cut -d " " -f 3- | tr -d \"` fi @@ -63,7 +68,7 @@ fi # Extract three numbers from kernel release string -linuxversion=`echo $kernelrelease | grep -oE [[0-9]]+\.[[0-9]]+\.[[0-9]]+` +linuxversion=`echo $kernelrelease | grep -oE "^[[0-9]]+\.[[0-9]]+\.[[0-9]]+"` AC_SUBST(LINUX_SOURCE_DIR,[$sourcedir]) AC_SUBST(LINUX_KERNEL_RELEASE,[$kernelrelease])