From ed8edbe3329f6fd2506c376e37eaa0e5c8d6afd7 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Mon, 15 Jan 2007 09:49:07 +0000 Subject: [PATCH] Fixed bad configure behavior with complex kernel version strings. --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index d62c2a22..2a0ae50a 100644 --- a/configure.ac +++ b/configure.ac @@ -50,10 +50,10 @@ if test \! -r ${sourcedir}/.config; then fi # Try to get kernel release string -if test -r ${sourcedir}/.kernelrelease; then - kernelrelease=`cat $sourcedir/.kernelrelease` -elif test -r ${sourcedir}/include/config/kernel.release; 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 \"` @@ -68,7 +68,7 @@ if test -z "$kernelrelease"; then 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])