LU-2068 build: Respect "--without-ldiskfs" option

The "--without-ldiskfs" configure option was not properly
being respected by a few of the Makefiles. This change is
an attempt to remedy this issue. Now, one should be able
to disable building ldiskfs and the related lvfs and osd
code with "--without-ldiskfs".

Signed-off-by: Prakash Surya <surya1@llnl.gov>
Change-Id: I502e125639a60f62a37e3f95ecc943dedc37f5ea
Reviewed-on: http://review.whamcloud.com/4148
Tested-by: Hudson
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>

diff --git a/configure.ac b/configure.ac
index d740004..2b96a97 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,9 @@
 AC_INIT([Lustre], [LUSTRE_VERSION], [http://bugs.whamcloud.com/], [lustre])
 sinclude(lustre/autoconf/lustre-version.ac)
 
-# Overridden in LB_PATH_LDISKFS on certain branches
-AM_CONDITIONAL(LDISKFS_ENABLED, false)
+# Overridden by --with-ldiskfs/--with-zfs configure options
+AM_CONDITIONAL(LDISKFS_ENABLED, true)
+AM_CONDITIONAL(ZFS_ENABLED, false)
 
 LB_CHECK_VERSION
 

diff --git a/lustre/Makefile.in b/lustre/Makefile.in
index 6886694..ada560b 100644 (file)
--- a/lustre/Makefile.in
+++ b/lustre/Makefile.in
@@ -7,9 +7,10 @@ subdir-m += osc
 subdir-m += obdecho
 subdir-m += mgc
 
-@SERVER_TRUE@subdir-m += mds obdfilter ost mgs mdt cmm mdd ofd osd-ldiskfs
+@SERVER_TRUE@subdir-m += mds obdfilter ost mgs mdt cmm mdd ofd
 @SERVER_TRUE@subdir-m += quota osp lod
 @CLIENT_TRUE@subdir-m += mdc lmv llite fld
+@LDISKFS_ENABLED_TRUE@subdir-m += osd-ldiskfs
 @ZFS_ENABLED_TRUE@subdir-m += osd-zfs
 @OSDADDON@
 

diff --git a/lustre/lvfs/Makefile.in b/lustre/lvfs/Makefile.in
index 48b61b6..cd2b0d8 100644 (file)
--- a/lustre/lvfs/Makefile.in
+++ b/lustre/lvfs/Makefile.in
@@ -1,9 +1,9 @@
 MODULES := lvfs
-@SERVER_TRUE@MODULES += fsfilt_ldiskfs
+@LDISKFS_ENABLED_TRUE@MODULES += fsfilt_ldiskfs
 
 lvfs-objs := lvfs_common.o lvfs_linux.o fsfilt.o lvfs_lib.o
 
-fsfilt_ldiskfs-objs := fsfilt-ldiskfs.o
+@LDISKFS_ENABLED_TRUE@fsfilt_ldiskfs-objs := fsfilt-ldiskfs.o
 
 $(obj)/fsfilt-%.c: $(obj)/fsfilt_%.c
        ln -s $< $@

diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am
index c684b50..8b8c649 100644 (file)
--- a/lustre/lvfs/autoMakefile.am
+++ b/lustre/lvfs/autoMakefile.am
@@ -52,11 +52,14 @@ if LINUX
 modulefs_DATA := lvfs$(KMODEXT)
 
 if SERVER
+if LDISKFS_ENABLED
 modulefs_DATA += fsfilt_ldiskfs$(KMODEXT)
 
 sources: fsfilt_ldiskfs.c
        touch sources
-
+else #LDISKFS_ENABLED
+sources:
+endif #LDISKFS_ENABLED
 else #SERVER
 sources:
 

diff --git a/lustre/osd-ldiskfs/autoMakefile.am b/lustre/osd-ldiskfs/autoMakefile.am
index 2952a75..b879105 100644 (file)
--- a/lustre/osd-ldiskfs/autoMakefile.am
+++ b/lustre/osd-ldiskfs/autoMakefile.am
@@ -35,8 +35,10 @@
 #
 
 if MODULES
+if LDISKFS_ENABLED
 modulefs_DATA = osd_ldiskfs$(KMODEXT)
 endif
+endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
 EXTRA_DIST := $(osd_ldiskfs-objs:%.o=%.c) osd_internal.h osd_oi.h osd_igif.h \