handle case where quadrics headers are in an odd location

diff --git a/lnet/archdep.m4 b/lnet/archdep.m4
index f8d8576..497e8c2 100644 (file)
--- a/lnet/archdep.m4
+++ b/lnet/archdep.m4
@@ -306,7 +306,11 @@ if test -d $LINUX/drivers/net/qsnet ; then
                QSWCPPFLAGS="-DMULTIRAIL_EKC=1"
        else
                AC_MSG_RESULT([not supported])
-               QSWCPPFLAGS="-I$LINUX/drivers/net/qsnet/include"
+               if test -d $LINUX/drivers/net/qsnet/include; then
+                       QSWCPPFLAGS="-I$LINUX/drivers/net/qsnet/include"
+               else
+                       QSWCPPFLAGS="-I$LINUX/include/linux"
+               fi
        fi
 else
        AC_MSG_RESULT([no])

diff --git a/lnet/klnds/qswlnd/Makefile.in b/lnet/klnds/qswlnd/Makefile.in
index 60d09c8..d27240c 100644 (file)
--- a/lnet/klnds/qswlnd/Makefile.in
+++ b/lnet/klnds/qswlnd/Makefile.in
@@ -1,6 +1,6 @@
 MODULES := kqswnal
 kqswnal-objs := qswnal.o qswnal_cb.o
 
-EXTRA_PRE_CFLAGS := @QSWCPPFLAGS@ -I/usr/include
+EXTRA_POST_CFLAGS := @QSWCPPFLAGS@ -I/usr/include
 
 @INCLUDE_RULES@

diff --git a/lustre/portals/archdep.m4 b/lustre/portals/archdep.m4
index f8d8576..497e8c2 100644 (file)
--- a/lustre/portals/archdep.m4
+++ b/lustre/portals/archdep.m4
@@ -306,7 +306,11 @@ if test -d $LINUX/drivers/net/qsnet ; then
                QSWCPPFLAGS="-DMULTIRAIL_EKC=1"
        else
                AC_MSG_RESULT([not supported])
-               QSWCPPFLAGS="-I$LINUX/drivers/net/qsnet/include"
+               if test -d $LINUX/drivers/net/qsnet/include; then
+                       QSWCPPFLAGS="-I$LINUX/drivers/net/qsnet/include"
+               else
+                       QSWCPPFLAGS="-I$LINUX/include/linux"
+               fi
        fi
 else
        AC_MSG_RESULT([no])

diff --git a/lustre/portals/knals/qswnal/Makefile.in b/lustre/portals/knals/qswnal/Makefile.in
index 60d09c8..d27240c 100644 (file)
--- a/lustre/portals/knals/qswnal/Makefile.in
+++ b/lustre/portals/knals/qswnal/Makefile.in
@@ -1,6 +1,6 @@
 MODULES := kqswnal
 kqswnal-objs := qswnal.o qswnal_cb.o
 
-EXTRA_PRE_CFLAGS := @QSWCPPFLAGS@ -I/usr/include
+EXTRA_POST_CFLAGS := @QSWCPPFLAGS@ -I/usr/include
 
 @INCLUDE_RULES@