handle case where quadrics headers are in an odd location

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])

lnet/klnds/qswlnd/Makefile.in

 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@

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])

lustre/portals/knals/qswnal/Makefile.in

 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@