From 038125407303be5b0726a73c07bbfe48e6037801 Mon Sep 17 00:00:00 2001 From: nic <nic> Date: Mon, 26 Apr 2004 22:22:14 +0000 Subject: [PATCH] handle case where quadrics headers are in an odd location --- lnet/archdep.m4 | 6 +++++- lnet/klnds/qswlnd/Makefile.in | 2 +- lustre/portals/archdep.m4 | 6 +++++- lustre/portals/knals/qswnal/Makefile.in | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lnet/archdep.m4 b/lnet/archdep.m4 index f8d8576c17..497e8c208a 100644 --- 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 60d09c841b..d27240ca4b 100644 --- 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 f8d8576c17..497e8c208a 100644 --- 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 60d09c841b..d27240ca4b 100644 --- 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@ -- GitLab