Fix bug in the rh-2.4.20 detector which would always think it's 2.4.20

diff --git a/lnet/archdep.m4 b/lnet/archdep.m4
index c4aa1bb..dffbec2 100644 (file)
--- a/lnet/archdep.m4
+++ b/lnet/archdep.m4
@@ -145,7 +145,7 @@ fi
 # ------------ include paths ------------------
 
 if test $host_cpu != "lib" ; then 
-    KINCFLAGS='-I$(top_srcdir)/include -I$(top_srcdir)/portals/include -I$(LINUX)/include'
+    KINCFLAGS="-I\$(top_srcdir)/include -I\$(top_srcdir)/portals/include -I$LINUX/include"
 else
     KINCFLAGS='-I$(top_srcdir)/include -I$(top_srcdir)/portals/include'
 fi
@@ -310,8 +310,8 @@ AC_TRY_LINK([#define __KERNEL__
              #include <linux/sched.h>],
             [struct task_struct p;
              p.sighand = NULL;],
-            [RH_2_4_20=0],
-            [RH_2_4_20=1])
+            [RH_2_4_20=1],
+            [RH_2_4_20=0])
 
 CPPFLAGS=$SAVE_CPPFLAGS
 CFLAGS=$SAVE_CFLAGS

diff --git a/lustre/portals/archdep.m4 b/lustre/portals/archdep.m4
index c4aa1bb..dffbec2 100644 (file)
--- a/lustre/portals/archdep.m4
+++ b/lustre/portals/archdep.m4
@@ -145,7 +145,7 @@ fi
 # ------------ include paths ------------------
 
 if test $host_cpu != "lib" ; then 
-    KINCFLAGS='-I$(top_srcdir)/include -I$(top_srcdir)/portals/include -I$(LINUX)/include'
+    KINCFLAGS="-I\$(top_srcdir)/include -I\$(top_srcdir)/portals/include -I$LINUX/include"
 else
     KINCFLAGS='-I$(top_srcdir)/include -I$(top_srcdir)/portals/include'
 fi
@@ -310,8 +310,8 @@ AC_TRY_LINK([#define __KERNEL__
              #include <linux/sched.h>],
             [struct task_struct p;
              p.sighand = NULL;],
-            [RH_2_4_20=0],
-            [RH_2_4_20=1])
+            [RH_2_4_20=1],
+            [RH_2_4_20=0])
 
 CPPFLAGS=$SAVE_CPPFLAGS
 CFLAGS=$SAVE_CFLAGS