Branch HEAD

b=17584
i=adilger
i=alex.zhuravlev

Recurse into 'spl' and 'zfs' repositories when 'make'ing in a configured kDMU tree.

diff --git a/autoMakefile.am b/autoMakefile.am
index 2a9976f..d979a8e 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,4 +1,4 @@
-SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
+SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre

 DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre 
 SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
 RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
 DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre 
 SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
 RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 343748d..3669e5e 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -524,12 +524,11 @@ if test x$dmu_osd = xyes; then
                AC_CONFIG_SUBDIRS(lustre/zfs-lustre)
        else
                # Kernel DMU
                AC_CONFIG_SUBDIRS(lustre/zfs-lustre)
        else
                # Kernel DMU

-               SPL_DIR="$PWD/spl"
-               ZFS_DIR="$PWD/zfs"
-               AC_SUBST(SPL_DIR)
-               AC_SUBST(ZFS_DIR)
+               SPL_SUBDIR="spl"
+               ZFS_SUBDIR="zfs"

 
 

-               AC_SUBST(spl_src)
+               SPL_DIR="$PWD/$SPL_SUBDIR"
+               ZFS_DIR="$PWD/$ZFS_SUBDIR"

 
                LB_CHECK_FILE([$SPL_DIR/module/spl/spl-generic.c],[],[
                        AC_MSG_ERROR([A complete SPL tree was not found in $SPL_DIR.])
 
                LB_CHECK_FILE([$SPL_DIR/module/spl/spl-generic.c],[],[
                        AC_MSG_ERROR([A complete SPL tree was not found in $SPL_DIR.])


@@ -544,6 +543,10 @@ if test x$dmu_osd = xyes; then
                AC_CONFIG_SUBDIRS(zfs)
        fi
 fi
                AC_CONFIG_SUBDIRS(zfs)
        fi
 fi

+AC_SUBST(SPL_SUBDIR)
+AC_SUBST(ZFS_SUBDIR)
+AC_SUBST(SPL_DIR)
+AC_SUBST(ZFS_DIR)

 AM_CONDITIONAL(DMU_OSD_ENABLED, test x$dmu_osd = xyes)
 AM_CONDITIONAL(KDMU, test x$dmu_osd$enable_uoss = xyesno)
 ])
 AM_CONDITIONAL(DMU_OSD_ENABLED, test x$dmu_osd = xyes)
 AM_CONDITIONAL(KDMU, test x$dmu_osd$enable_uoss = xyesno)
 ])