[Ocfs2-commits] jlbec commits r3017 - branches/ocfs2-1.2

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2007-05-03 14:14:48 -0700 (Thu, 03 May 2007)
New Revision: 3017

Modified:
   branches/ocfs2-1.2/configure.in
Log:

From: Jeff Mahoney <jeffm at suse.com>

The SUSE kernel module packages allow you to generate RPMs for all
installed kernels with one run of rpmbuild. This involves the use
of one shared source tree at /usr/src/linux and a group of build
trees rooted at /usr/src/linux-obj. The build trees contain the bare
minimum needed for a kernel tree to be considered "configured."

With the current configure script, it's looking in the
- --with-kernel-source directory for a configured kernel when it should
be looking in the directory provided by --with-kernel. When I specify

./configure --with-kernel=/usr/src/linux-obj/x86_64/smp \
            --with-kernel-source=/usr/src/linux

it fails, since /usr/src/linux doesn't contain a configured kernel. I
used KERNELBUILD, rather than just switching KERNELINC, because other
tests (like the one for generic_drop_inode being exported) actually
need to look at the full includes for the kernel.

Signed-off-by: smushran




Modified: branches/ocfs2-1.2/configure.in
===================================================================
--- branches/ocfs2-1.2/configure.in	2007-05-03 19:29:17 UTC (rev 3016)
+++ branches/ocfs2-1.2/configure.in	2007-05-03 21:14:48 UTC (rev 3017)
@@ -108,13 +108,14 @@
 AC_MSG_RESULT($kernelsourcedir)
 
 KERNELSRC="$kernelsourcedir"
+KERNELBUILD="$kerneldir"
 KERNELINC="$KERNELSRC/include"
 
-if test ! -f "$KERNELINC/linux/autoconf.h"; then
+if test ! -f "$KERNELBUILD/include/linux/autoconf.h"; then
   AC_MSG_ERROR(No configured kernel include tree found)
 fi
 
-OCFS2_CHECK_KVER($KERNELINC, ksourceversion, "source")
+OCFS2_CHECK_KVER("$KERNELBUILD/include", ksourceversion, "source")
 
 
 if test "$kversion" != "$ksourceversion"; then