[Ocfs2-commits] manish commits r1478 - trunk

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-09-20 16:51:09 -0500 (Mon, 20 Sep 2004)
New Revision: 1478

Modified:
   trunk/configure.in
Log:
Make 2.6 source tree guessing smarter


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2004-09-20 19:22:06 UTC (rev 1477)
+++ trunk/configure.in	2004-09-20 21:51:09 UTC (rev 1478)
@@ -193,13 +193,15 @@
 
 AC_MSG_CHECKING(for directory with kernel source)
 AC_ARG_WITH(kernel-source, [  --with-kernel-source=dir Path to the kernel source [[autodetect]]], kernelsrc="$withval", [
-  if test -r /etc/UnitedLinux-release -o -r /etc/SuSE-release ; then
+  guesskver=
+  if test -r /etc/UnitedLinux-release -o -r /etc/SuSE-release; then
     guesskver=`echo "$kversion" | sed 's/-[[^-]]*$//'`
-    if test -d "/usr/src/linux-${guesskver}"; then
-      kernelsrc="/usr/src/linux-${guesskver}"
-    else
-      kernelsrc="$kerneldir"
-    fi
+  elif test "x$KERNEL_26" = "xyes" -a -r /etc/redhat-release; then
+    guesskver="$kversion"
+  fi
+
+  if test -n "$guesskver" -a -d "/usr/src/linux-${guesskver}"; then
+    kernelsrc="/usr/src/linux-${guesskver}"
   else
     kernelsrc="$kerneldir"
   fi
@@ -295,7 +297,7 @@
 fi
 AC_SUBST(MODVERSIONS)
 
-CPPFLAGS="-I$KERNELSRC/include $saved_CPPFLAGS"
+CPPFLAGS="-I$KERNELSRC/include $CPPFLAGS"
 
 AC_MSG_CHECKING([for NPTL support])
 AC_TRY_COMPILE(