X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=config%2Flustre-build.m4;fp=config%2Flustre-build.m4;h=4b9f9d152c5196ddca729a25bf6577c7f2b87c9d;hb=24f825e2934a40811c651e8943f843a80b70f97d;hp=947b632deb9e05953dd65eb9425227219d47b8f6;hpb=84a70d296c68cea9da9dc5502022121798fe5cd7;p=fs%2Flustre-release.git

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index 947b632..4b9f9d1 100644
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -165,8 +165,10 @@ AS_IF([test "x$enable_modules" = xyes], [
 		], [*], [
 			# This is strange - Lustre supports a target we don't
 			AC_MSG_ERROR([Modules are not supported on $target_os])
-		])
 	])
+	# Use OpenSFS UAPI header path instead of linux kernel
+	CPPFLAGS="-I$PWD/lnet/include/uapi -I$PWD/lustre/include/uapi $CPPFLAGS"
+])
 ]) # LB_CONFIG_MODULES
 
 #
@@ -316,8 +318,8 @@ AS_IF([test $target_cpu = powerpc64], [
 	CC="$CC -m64"
 ])
 
-# UAPI headers, libcfs/include for util headers, lustre/include for liblustreapi and friends
-CPPFLAGS="-I$PWD/libcfs/include -I$PWD/lnet/include/uapi -I$PWD/lustre/include -I$PWD/lustre/include/uapi $CPPFLAGS"
+# libcfs/include for util headers, lnetconfig headers, lustre/include for liblustreapi and friends
+CPPFLAGS="-I$PWD/libcfs/include -I$PWD/lnet/utils -I$PWD/lustre/include $CPPFLAGS"
 
 CCASFLAGS="-Wall -fPIC -D_GNU_SOURCE"
 AC_SUBST(CCASFLAGS)