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
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@
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 $< $@
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:
#
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 \