X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fautoconf%2Flustre-build.m4;h=43cd54fa8b1e0950acd6521535c99d2a766b5fc8;hb=12e4bb4ccef0d20558800daf03576f1cf53e67d7;hp=47be784183a6fbb710973d2abc64bee898ed85ee;hpb=fbe40f6fad62a3a699c4d04dbc9b68ce1485d870;p=fs%2Flustre-release.git

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 47be784..43cd54f 100644
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -160,6 +160,46 @@ AC_CONFIG_SUBDIRS(libsysio)
 ])
 
 #
+# LB_PATH_LUSTREIOKIT
+#
+# Handle internal/external lustre-iokit
+#
+AC_DEFUN([LB_PATH_LUSTREIOKIT],
+[AC_ARG_WITH([],
+	AC_HELP_STRING([--with-lustre-iokit=path],
+			[set path to lustre-iokit source (default is included lustre-iokit)]),
+	[],[
+			with_lustre_iokit='yes'
+	])
+AC_MSG_CHECKING([location of lustre-iokit])
+enable_lustre_iokit="$with_lustre_iokit"
+case x$with_lustre_iokit in
+	xyes)
+		AC_MSG_RESULT([internal])
+		LB_CHECK_FILE([$srcdir/lustre-iokit/ior-survey/ior-survey],[],[
+			AC_MSG_ERROR([A complete internal lustre-iokit was not found.])
+		])
+		LUSTREIOKIT_SUBDIR="lustre-iokit"
+		LUSTREIOKIT="$PWD/lustre-iokit"
+		;;
+	xno)
+		AC_MSG_RESULT([disabled])
+		;;
+	*)
+		AC_MSG_RESULT([$with_lustre_iokit])
+		LB_CHECK_FILE([$with_lustre_iokit/ior-survey/ior_survey],[],[
+			AC_MSG_ERROR([A complete (built) external lustre-iokit was not found.])
+		])
+		LUSTREIOKIT="$with_lustre_iokit"
+		with_lustre_iokit="yes"
+		;;
+esac
+AC_SUBST(LUSTREIOKIT_SUBDIR)
+# We have to configure even if we don't build here for make dist to work
+AC_CONFIG_SUBDIRS(lustre-iokit)
+])
+
+#
 # LB_PATH_LDISKFS
 #
 # Handle internal/external ldiskfs
@@ -640,6 +680,7 @@ LB_CONFIG_MODULES
 LB_PATH_LIBSYSIO
 LB_PATH_SNMP
 LB_PATH_LDISKFS
+LB_PATH_LUSTREIOKIT
 
 LC_CONFIG_LIBLUSTRE
 LN_CONFIGURE