b=14949

i=Adilger

integrate lustre-iokit into normal build process

diff --git a/Makefile.in b/Makefile.in
index 3ae031d..b1e9013 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,5 @@
 subdir-m += lnet
 subdir-m += lustre
+subdir-m += lustre-iokit
 
 @INCLUDE_RULES@

diff --git a/autoMakefile.am b/autoMakefile.am
index ab75c70..a07a500 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,5 +1,5 @@
-SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ lnet lustre
-DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs lnet lustre
+SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ lnet lustre
+DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @LUSTREIOKIT_SUBDIR@ lnet lustre 
 SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ lnet lustre
 RPM_SUBDIRS := @LDISKFS_SUBDIR@
 if LDISKFS_ENABLED

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 47be784..43cd54f 100644 (file)
--- 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

diff --git a/build/autogen.sh b/build/autogen.sh
index 1892ed1..b406459 100644 (file)
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -85,7 +85,7 @@ if [ -d kernel_patches ] ; then
 else
     REQUIRED_DIRS="build lnet lustre"
     OPTIONAL_DIRS="snmp portals"
-    CONFIGURE_DIRS="libsysio ldiskfs"
+    CONFIGURE_DIRS="libsysio lustre-iokit ldiskfs"
 fi
 
 for dir in $REQUIRED_DIRS ; do

diff --git a/build/buildcvs b/build/buildcvs
index b5cd8ef..40644e0 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -5,6 +5,7 @@ lnettag="HEAD"
 libsysiotag="HEAD"
 snmptag="HEAD"
 ldiskfstag="HEAD"
+lustreiokittag="HEAD"
 dmutag=""
 hg_base_url="http://www.wizy.org/mercurial"
 
@@ -250,6 +251,7 @@ cvs_cmd lnet lnet "$lnettag"
 cvs_cmd snmp lustre-snmp "$snmptag"
 cvs_cmd lustre lustre-core "$lustretag"
 cvs_cmd ldiskfs ldiskfs "$ldiskfstag"
+cvs_cmd lustre-iokit lustre-iokit "$lustreiokittag"
 hg_cmd zfs-lustre "$hg_base_url" "$dmutag"
 
 [ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build