[Ocfs2-commits] manish commits r1463 - trunk

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-09-13 15:50:05 -0500 (Mon, 13 Sep 2004)
New Revision: 1463

Modified:
   trunk/configure.in
Log:
Add --with-kernel-source, to allow specifying a complete source tree for
symbol checks


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2004-09-13 19:06:44 UTC (rev 1462)
+++ trunk/configure.in	2004-09-13 20:50:05 UTC (rev 1463)
@@ -122,8 +122,8 @@
 AC_SUBST(OCFS_LARGEIO)
 AC_MSG_RESULT($enable_largeio)
 
-AC_MSG_CHECKING(for directory with kernel source)
-AC_ARG_WITH(kernel, [  --with-kernel=dir       Path to the kernel source tree [/usr/src/linux]], kerneldir="$withval",
+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"
   else
@@ -141,6 +141,12 @@
   AC_MSG_ERROR(No configured kernel include tree found)
 fi
 
+AC_MSG_CHECKING(for directory with kernel source)
+AC_ARG_WITH(kernel-source, [  --with-kernel-source=dir Path to the kernel source [[same as kernel build tree]]], kernelsrc="$withval", kernelsrc="$kerneldir")
+AC_MSG_RESULT($kernelsrc)
+
+KERNELSRC=$kernelsrc
+
 saved_CPPFLAGS="$CPPFLAGS"
 saved_CFLAGS="$CFLAGS"
 
@@ -226,7 +232,7 @@
 
 AC_MSG_CHECKING([whether to build aio])
 if test "x$OCFS_AIO" = "xyes"; then
-  if egrep "EXPORT_SYMBOL.*\(brw_kvec_async\);" "$kerneldir/kernel/ksyms.c" "$kerneldir/fs/buffer.c" >/dev/null 2>&1; then
+  if egrep "EXPORT_SYMBOL.*\(brw_kvec_async\);" "$kernelsrc/kernel/ksyms.c" "$kernelsrc/fs/buffer.c" >/dev/null 2>&1; then
     have_aio=yes
   else
     have_aio=no
@@ -257,11 +263,11 @@
 
 COMPAT_SAFE_WRITE=
 AC_MSG_CHECKING([for safe write ordering])
-if egrep "EXPORT_SYMBOL.*\(generic_file_write_nolock\);" "$kerneldir/mm/filemap.c" >/dev/null 2>&1; then
+if egrep "EXPORT_SYMBOL.*\(generic_file_write_nolock\);" "$kernelsrc/mm/filemap.c" >/dev/null 2>&1; then
   have_safe_write=yes
-elif egrep "EXPORT_SYMBOL.*\(generic_file_write_nolock\);" "$kerneldir/kernel/ksyms.c" >/dev/null 2>&1; then
+elif egrep "EXPORT_SYMBOL.*\(generic_file_write_nolock\);" "$kernelsrc/kernel/ksyms.c" >/dev/null 2>&1; then
   have_safe_write=yes
-elif egrep "EXPORT_SYMBOL.*\(do_generic_file_write\);" "$kerneldir/kernel/ksyms.c" >/dev/null 2>&1; then
+elif egrep "EXPORT_SYMBOL.*\(do_generic_file_write\);" "$kernelsrc/kernel/ksyms.c" >/dev/null 2>&1; then
   have_safe_write=yes
   COMPAT_SAFE_WRITE=yes
 else
@@ -294,7 +300,7 @@
 CFLAGS="$saved_CFLAGS"
 
 AC_MSG_CHECKING(for directory for kernel modules)
-AC_ARG_WITH(moddir, [  --with-moddir=/path     Path to where modules should be installed [/lib/modules/<KVER>/fs]], moddir="$withval", moddir="/lib/modules/$kversion/kernel/fs")
+AC_ARG_WITH(moddir, [  --with-moddir=/path     Path to where modules should be installed [[/lib/modules/<KVER>/fs]]], moddir="$withval", moddir="/lib/modules/$kversion/kernel/fs")
 AC_MSG_RESULT($moddir)
 
 MODULEDIR=$moddir