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

[svn-commits@oss.oracle.com]

Author: jlbec
Signed-off-by: mfasheh
Date: 2006-07-07 01:14:31 -0500 (Fri, 07 Jul 2006)
New Revision: 2922

Modified:
   branches/ocfs2-1.2/kver.m4
Log:

Somewhere around 2.6.18-rc1, the kernel moved UTS_RELEASE from
linux/version.h to linux/utsname.h.  We detect UTS_RELEASE in kver.m4.  So,
we teach kver.m4 to look for linux/utsname.h.  It works for old and new.

Signed-off-by: mfasheh



Modified: branches/ocfs2-1.2/kver.m4
===================================================================
--- branches/ocfs2-1.2/kver.m4	2006-07-06 00:49:58 UTC (rev 2921)
+++ branches/ocfs2-1.2/kver.m4	2006-07-07 06:14:31 UTC (rev 2922)
@@ -8,13 +8,19 @@
      check_kver_DESC=" $check_kver_DESC"
    fi
 
+   if test -f "$1/linux/utsrelease.h"; then
+     UTS_HEADER=utsrelease.h
+   else
+     UTS_HEADER=version.h
+   fi
+
    check_kver_saved_CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="-I$1 $CPPFLAGS -nostdinc"
 
    AC_MSG_CHECKING(for kernel$check_kver_DESC version)
 
    AC_LANG_CONFTEST([AC_LANG_SOURCE([
-#include <linux/version.h>
+#include <linux/${UTS_HEADER}>
 
 #ifdef UTS_RELEASE
 check_kver_RESULT=UTS_RELEASE