From: rcorreia <rcorreia>
Date: Mon, 11 May 2009 22:53:23 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: GIT_EPOCH_B1_6~2^5~27
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=277f6994d92ae673249d52c55fad027ecd106411;p=fs%2Flustre-release.git

Branch b1_6
b=17584
i=adilger
i=alex.zhuravlev

Fix the build errors in b1_6 due to the recent changes to the top-level autoMakefile.am.
This is being fixed by applying the missing part of the patch to the b1_6 branch of the build module.
---

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 343748d..3669e5e 100644
--- 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
-		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.])
@@ -544,6 +543,10 @@ if test x$dmu_osd = xyes; then
 		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)
 ])