X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-build-zfs.m4;h=f632df1ab07ca65e355fe13b8dcc6d65f28945e0;hp=80dfcfffe88574ec6540aabf7dbd333689d4b1d0;hb=9a085781b34d3dbe46c61db21c2681a0d31136de;hpb=a245dde23a9fdbdff7d09a783bcbe3349f68a908

diff --git a/config/lustre-build-zfs.m4 b/config/lustre-build-zfs.m4
index 80dfcff..f632df1 100644
--- a/config/lustre-build-zfs.m4
+++ b/config/lustre-build-zfs.m4
@@ -548,15 +548,24 @@ your distribution.
 		dnl #
 		dnl # ZFS 0.7.0 feature: MULTIHOST
 		dnl #
-		LB_CHECK_COMPILE([if ZFS has multihost protection],
-		spa_multihost, [
-			#include <sys/spa.h>
-		],[
+		restore_CFLAGS=$CFLAGS
+		CFLAGS="$CFLAGS $ZFS_LIBZFS_INCLUDE -Werror"
+		AC_MSG_CHECKING([[if ZFS has multihost protection]])
+		AC_COMPILE_IFELSE([
+		  AC_LANG_PROGRAM(
+		  [[
+		    #define _LARGEFILE64_SOURCE 1
+		    #include <sys/sysmacros.h>
+		    #include <sys/spa.h>
+		  ]], [[
 			spa_multihost(NULL);
-		],[
-			AC_DEFINE(HAVE_ZFS_MULTIHOST, 1,
-				[Have multihost protection in ZFS])
-		])
+		  ]])
+		  ],[
+		  AC_DEFINE(HAVE_ZFS_MULTIHOST, 1,
+			[Have multihost protection in ZFS])
+		  spa_multihost_fn="yes"],[spa_multihost_fn="no"]),
+		AC_MSG_RESULT([$spa_multihost_fn])
+		CFLAGS=$restore_CFLAGS
 		dnl #
 		dnl # ZFS 0.7.x adds new method zap_lookup_by_dnode
 		dnl #