b=5782

 - added --disable-server and --disable-client configure options (5782)

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index c9ab087..b880c5c 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -40,6 +40,7 @@ tbd         Cluster File Systems, Inc. <info@clusterfs.com>
        - improved "lustre status" script
        - initialize blocksize for non-regular files (6062)
        - Do not unhash mountpoint dentries (5907)
+       - added --disable-server and --disable-client configure options (5782)
 
 2005-03-22  Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.4.1

diff --git a/lustre/Makefile.in b/lustre/Makefile.in
index 789f656..d6e7684 100644 (file)
--- a/lustre/Makefile.in
+++ b/lustre/Makefile.in
@@ -1,15 +1,13 @@
-@LDISKFS_TRUE@subdir-m  += ldiskfs
+@LDISKFS_TRUE@subdir-m += ldiskfs
 
 subdir-m += lvfs
 subdir-m += obdclass
 subdir-m += lov
 subdir-m += ptlrpc
-subdir-m += obdecho
 subdir-m += osc
-subdir-m += mdc
-subdir-m += mds
-subdir-m += obdfilter
-subdir-m += ost
-subdir-m += llite
+subdir-m += obdecho
+
+@SERVER_TRUE@subdir-m += mds obdfilter ost
+@CLIENT_TRUE@subdir-m += mdc llite
 
 @INCLUDE_RULES@

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index c94d7cc..6ab2f9d 100644 (file)
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -5,10 +5,25 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = include ldiskfs lvfs obdclass lov ldlm ptlrpc                        \
-       obdecho osc mdc mds obdfilter ost llite \
+ALWAYS_SUBDIRS := include lvfs obdclass ldlm ptlrpc osc lov obdecho \
        liblustre doc utils tests conf scripts autoconf
 
+SERVER_SUBDIRS := ldiskfs obdfilter ost mds
+
+CLIENT_SUBDIRS := mdc llite
+
+SUBDIRS := $(ALWAYS_SUBDIRS)
+
+if SERVER
+SUBDIRS += $(SERVER_SUBDIRS)
+endif
+
+if CLIENT
+SUBDIRS += $(CLIENT_SUBDIRS)
+endif
+
+DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)
+
 EXTRA_DIST = BUGS FDL kernel_patches
 
 if LDISKFS

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index c8ac15b..bbc9fbd 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -389,7 +389,9 @@ AC_DEFINE_UNQUOTED(OBD_MAX_IOCTL_BUFFER, $OBD_BUFFER_SIZE, [IOCTL Buffer Size])
 # Lustre linux kernel checks
 #
 AC_DEFUN([LC_PROG_LINUX],
-[LC_CONFIG_BACKINGFS
+[if test x$enable_server = xyes ; then
+       LC_CONFIG_BACKINGFS
+fi
 LC_CONFIG_PINGER
 
 LC_STRUCT_KIOBUF
@@ -405,6 +407,26 @@ LC_FUNC_DEV_SET_RDONLY
 ])
 
 #
+# LC_CONFIG_CLIENT_SERVER
+#
+# Build client/server sides of Lustre
+#
+AC_DEFUN([LC_CONFIG_CLIENT_SERVER],
+[AC_MSG_CHECKING([whether to build Lustre server support])
+AC_ARG_ENABLE([server],
+       AC_HELP_STRING([--disable-server],
+                       [disable Lustre server support]),
+       [],[enable_server='yes'])
+AC_MSG_RESULT([$enable_server])
+
+AC_MSG_CHECKING([whether to build Lustre client support])
+AC_ARG_ENABLE([client],
+       AC_HELP_STRING([--disable-client],
+                       [disable Lustre client support]),
+       [],[enable_client='yes'])
+AC_MSG_RESULT([$enable_client])])
+
+#
 # LC_CONFIG_LIBLUSTRE
 #
 # whether to build liblustre
@@ -463,9 +485,10 @@ AC_DEFUN([LC_CONDITIONALS],
 AM_CONDITIONAL(EXTN, test x$enable_extN = xyes)
 AM_CONDITIONAL(LDISKFS, test x$enable_ldiskfs = xyes)
 AM_CONDITIONAL(USE_QUILT, test x$QUILT != xno)
-AM_CONDITIONAL(MPITESTS, test x$enable_mpitests = xyes, Build MPI Tests)
 AM_CONDITIONAL(LIBLUSTRE, test x$enable_liblustre = xyes)
 AM_CONDITIONAL(MPITESTS, test x$enable_mpitests = xyes, Build MPI Tests)
+AM_CONDITIONAL(CLIENT, test x$enable_client = xyes)
+AM_CONDITIONAL(SERVER, test x$enable_server = xyes)
 ])
 
 #

diff --git a/lustre/lvfs/Makefile.in b/lustre/lvfs/Makefile.in
index ac5a8a2..bcbeae9 100644 (file)
--- a/lustre/lvfs/Makefile.in
+++ b/lustre/lvfs/Makefile.in
@@ -1,4 +1,5 @@
-MODULES := lvfs fsfilt_@BACKINGFS@ quotactl_test quotacheck_test
+MODULES := lvfs quotactl_test quotacheck_test
+@SERVER_TRUE@MODULES += fsfilt_@BACKINGFS@
 
 lvfs-objs := lvfs_common.o lvfs_linux.o fsfilt.o
 quotactl-objs := quotactl_test.o

diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am
index 814d299..392186d 100644 (file)
--- a/lustre/lvfs/autoMakefile.am
+++ b/lustre/lvfs/autoMakefile.am
@@ -16,10 +16,16 @@ endif
 
 if MODULES
 
-modulefs_DATA = lvfs$(KMODEXT) fsfilt_$(BACKINGFS)$(KMODEXT)
+modulefs_DATA := lvfs$(KMODEXT)
 
+if SERVER
+modulefs_DATA += fsfilt_$(BACKINGFS)$(KMODEXT)
 sources: fsfilt_$(BACKINGFS).c
        touch sources
+else
+sources:
+
+endif
 
 fsfilt_extN.c: fsfilt_ext3.c
        sed -e "s/EXT3/EXTN/g" -e "s/ext3/extN/g" $< > $@