[Ocfs2-commits] manish commits r1547 - trunk

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-10-05 15:44:23 -0500 (Tue, 05 Oct 2004)
New Revision: 1547

Modified:
   trunk/configure.in
Log:
Assume every 2.6 has NPTL. Simplifies fragile kernel guessing


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2004-10-05 20:43:28 UTC (rev 1546)
+++ trunk/configure.in	2004-10-05 20:44:23 UTC (rev 1547)
@@ -193,15 +193,13 @@
 
 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", [
-  guesskver=
   if test -r /etc/UnitedLinux-release -o -r /etc/SuSE-release; then
     guesskver=`echo "$kversion" | sed 's/-[[^-]]*$//'`
-  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}"
+    if test -d "/usr/src/linux-${guesskver}"; then
+      kernelsrc="/usr/src/linux-${guesskver}"
+    else
+      kernelsrc="$kerneldir"
+    fi
   else
     kernelsrc="$kerneldir"
   fi
@@ -297,14 +295,18 @@
 fi
 AC_SUBST(MODVERSIONS)
 
-CPPFLAGS="-I$KERNELSRC/include $CPPFLAGS"
+CPPFLAGS="-I$KERNELSRC/include $saved_CPPFLAGS"
 
 AC_MSG_CHECKING([for NPTL support])
-AC_TRY_COMPILE(
+if test "x$KERNEL_26" = "xyes"; then
+  have_NPTL=yes
+else
+  AC_TRY_COMPILE(
 [#define __KERNEL__ 1
 #include <linux/autoconf.h>
 #include <linux/sched.h>],
 [recalc_sigpending ();], have_NPTL=yes, have_NPTL=no)
+fi
 AC_MSG_RESULT($have_NPTL)
 
 HAVE_NPTL=