I think I've finally got it; we don't want to save the cppflags before

doing the rh-2.4.20 check

diff --git a/lnet/archdep.m4 b/lnet/archdep.m4
index dffbec2..2c7fa59 100644 (file)
--- a/lnet/archdep.m4
+++ b/lnet/archdep.m4
@@ -301,10 +301,6 @@ AM_CONDITIONAL(LIBLUSTRE, test x$host_cpu = xlib)
 # ---------- Red Hat 2.4.20 backports some 2.5 bits --------
 # This needs to run after we've defined the KCPPFLAGS
 
-SAVE_CPPFLAGS=$CPPFLAGS
-SAVE_CFLAGS=$CFLAGS
-CPPFLAGS=$KCPPFLAGS
-CFLAGS=$KCFLAGS
 AC_MSG_CHECKING(for kernel version)
 AC_TRY_LINK([#define __KERNEL__
              #include <linux/sched.h>],
@@ -313,9 +309,6 @@ AC_TRY_LINK([#define __KERNEL__
             [RH_2_4_20=1],
             [RH_2_4_20=0])
 
-CPPFLAGS=$SAVE_CPPFLAGS
-CFLAGS=$SAVE_CFLAGS
-
 if test $RH_2_4_20 = 1; then
        AC_MSG_RESULT(redhat-2.4.20)
        CPPFLAGS="$CPPFLAGS -DCONFIG_RH_2_4_20"

diff --git a/lustre/portals/archdep.m4 b/lustre/portals/archdep.m4
index dffbec2..2c7fa59 100644 (file)
--- a/lustre/portals/archdep.m4
+++ b/lustre/portals/archdep.m4
@@ -301,10 +301,6 @@ AM_CONDITIONAL(LIBLUSTRE, test x$host_cpu = xlib)
 # ---------- Red Hat 2.4.20 backports some 2.5 bits --------
 # This needs to run after we've defined the KCPPFLAGS
 
-SAVE_CPPFLAGS=$CPPFLAGS
-SAVE_CFLAGS=$CFLAGS
-CPPFLAGS=$KCPPFLAGS
-CFLAGS=$KCFLAGS
 AC_MSG_CHECKING(for kernel version)
 AC_TRY_LINK([#define __KERNEL__
              #include <linux/sched.h>],
@@ -313,9 +309,6 @@ AC_TRY_LINK([#define __KERNEL__
             [RH_2_4_20=1],
             [RH_2_4_20=0])
 
-CPPFLAGS=$SAVE_CPPFLAGS
-CFLAGS=$SAVE_CFLAGS
-
 if test $RH_2_4_20 = 1; then
        AC_MSG_RESULT(redhat-2.4.20)
        CPPFLAGS="$CPPFLAGS -DCONFIG_RH_2_4_20"