[Ocfs2-commits] manish commits r1894 - trunk

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-02-17 20:23:08 -0600 (Thu, 17 Feb 2005)
New Revision: 1894

Modified:
   trunk/configure.in
Log:
Make --with-kernel-source care about SLES9's source symlink setup


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-02-18 02:22:24 UTC (rev 1893)
+++ trunk/configure.in	2005-02-18 02:23:08 UTC (rev 1894)
@@ -142,10 +142,13 @@
 AC_SUBST(OCFS_LARGEIO)
 AC_MSG_RESULT($enable_largeio)
 
+kernelroot="/lib/modules/`uname -r`"
+
 AC_MSG_CHECKING(for directory with kernel build tree)
 AC_ARG_WITH(kernel, [  --with-kernel=dir       Path to the kernel build tree [[/usr/src/linux]]], kerneldir="$withval", [
-  if test -d "/lib/modules/`uname -r`/build" -o -L "/lib/modules/`uname -r`/build"; then
-    kerneldir="/lib/modules/`uname -r`/build"
+  kbuild="$kernelroot/build"
+  if test -d "$kbuild" -o -L "$kbuild"; then
+    kerneldir="$kbuild"
   else
     kerneldir="/usr/src/linux"
   fi
@@ -155,8 +158,22 @@
 KERNELDIR=$kerneldir
 AC_SUBST(KERNELDIR)
 
-KERNELINC="$kerneldir/include"
+AC_MSG_CHECKING(for directory with kernel sources)
+AC_ARG_WITH(kernel-source, [  --with-kernel-source=dir Path to the kernel source [[autodetect]]], kernelsourcedir="$withval", [
+  ksrc="$kernelroot/source"
+  if test -f "$kerneldir/include/linux/fs.h"; then
+    kernelsourcedir="$kerneldir"
+  elif test -d "$ksrc" -o -L "$ksrc"; then
+    kernelsourcedir="$ksrc"
+  else
+    AC_MSG_RESULT([not found])
+    AC_MSG_ERROR([Couldn't find kernel sources])
+  fi
+])
+AC_MSG_RESULT($kernelsourcedir)
 
+KERNELINC="$kernelsourcedir/include"
+
 if test ! -f "$KERNELINC/linux/autoconf.h"; then
   AC_MSG_ERROR(No configured kernel include tree found)
 fi
@@ -211,23 +228,6 @@
 KERNELVER=$kversion
 AC_SUBST(KERNELVER)
 
-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=`echo "$kversion" | sed 's/-[[^-]]*$//'`
-    if test -d "/usr/src/linux-${guesskver}"; then
-      kernelsrc="/usr/src/linux-${guesskver}"
-    else
-      kernelsrc="$kerneldir"
-    fi
-  else
-    kernelsrc="$kerneldir"
-  fi
-])
-AC_MSG_RESULT($kernelsrc)
-
-KERNELSRC=$kernelsrc
-
 COMPAT_SAFE_WRITE=
 AC_MSG_CHECKING([for safe write ordering])
 if test "x$KERNEL_26" = "xyes"; then
@@ -263,7 +263,7 @@
 fi
 AC_SUBST(MODVERSIONS)
 
-CPPFLAGS="-I$KERNELSRC/include $saved_CPPFLAGS"
+CPPFLAGS="-I$KERNELINC/include $saved_CPPFLAGS"
 
 AC_MSG_CHECKING([for NPTL support])
 if test "x$KERNEL_26" = "xyes"; then
@@ -312,7 +312,6 @@
 
 #this check will break for 2.4 kernels...
 AC_MSG_CHECKING([for kref_init with release callback])
-grep "kref_init.*release" "$KERNELINC/linux/kref.h"
 if grep "kref_init.*release" "$KERNELINC/linux/kref.h" >/dev/null 2>&1 ; then
   KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS kref_put.h"
   AC_MSG_RESULT(yes)