[Ocfs2-commits] manish commits r1931 - trunk

[svn-commits at oss.oracle.com]

Author: manish
Signed-off-by: zab
Date: 2005-03-01 22:51:55 -0600 (Tue, 01 Mar 2005)
New Revision: 1931

Modified:
   trunk/configure.in
Log:
Fix logic with kernel source and kernel include directories

Signed-off-by: zab


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-03-02 02:35:11 UTC (rev 1930)
+++ trunk/configure.in	2005-03-02 04:51:55 UTC (rev 1931)
@@ -172,8 +172,10 @@
 ])
 AC_MSG_RESULT($kernelsourcedir)
 
-KERNELINC="$kernelsourcedir/include"
+KERNELSRC="$kernelsourcedir"
 
+KERNELINC="$KERNELSRC/include"
+
 if test ! -f "$KERNELINC/linux/autoconf.h"; then
   AC_MSG_ERROR(No configured kernel include tree found)
 fi
@@ -232,9 +234,9 @@
 AC_MSG_CHECKING([for safe write ordering])
 if test "x$KERNEL_26" = "xyes"; then
   have_safe_write=yes
-elif egrep "EXPORT_SYMBOL.*\(generic_file_write_nolock\);" "$kernelsrc/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\);" "$kernelsrc/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
@@ -263,7 +265,7 @@
 fi
 AC_SUBST(MODVERSIONS)
 
-CPPFLAGS="-I$KERNELINC/include $saved_CPPFLAGS"
+CPPFLAGS="-I$KERNELINC $saved_CPPFLAGS"
 
 AC_MSG_CHECKING([for NPTL support])
 if test "x$KERNEL_26" = "xyes"; then