From 04d9e98a70809c20150c596511ead24757e13919 Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Fri, 19 Mar 2004 09:30:22 +0000
Subject: [PATCH] Fix portals user-space compile breakage on x86_64.

---
 lnet/archdep.m4           | 4 ++--
 lustre/portals/archdep.m4 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lnet/archdep.m4 b/lnet/archdep.m4
index b8b5c9d..b203a95 100644
--- a/lnet/archdep.m4
+++ b/lnet/archdep.m4
@@ -168,9 +168,9 @@ fi
 
 KINCFLAGS="$CRAY_PORTALS_INCLUDE $CRAY_PORTALS_COMMANDLINE \
 	-I\$(top_srcdir)/include \
-	-I\$(top_srcdir)/portals/include -I$LINUX/include"
+	-I\$(top_srcdir)/portals/include"
 if test $host_cpu != "lib" ; then 
-    KINCFLAGS="$KINCFLAGS -I$LINUX/include"
+    KINCFLAGS="$KINCFLAGS -I$LINUX/include -I$LINUX/include"
 fi
 CPPFLAGS="$KINCFLAGS $ARCHCPPFLAGS"
 
diff --git a/lustre/portals/archdep.m4 b/lustre/portals/archdep.m4
index b8b5c9d..b203a95 100644
--- a/lustre/portals/archdep.m4
+++ b/lustre/portals/archdep.m4
@@ -168,9 +168,9 @@ fi
 
 KINCFLAGS="$CRAY_PORTALS_INCLUDE $CRAY_PORTALS_COMMANDLINE \
 	-I\$(top_srcdir)/include \
-	-I\$(top_srcdir)/portals/include -I$LINUX/include"
+	-I\$(top_srcdir)/portals/include"
 if test $host_cpu != "lib" ; then 
-    KINCFLAGS="$KINCFLAGS -I$LINUX/include"
+    KINCFLAGS="$KINCFLAGS -I$LINUX/include -I$LINUX/include"
 fi
 CPPFLAGS="$KINCFLAGS $ARCHCPPFLAGS"
 
-- 
1.8.3.1