liblustre:

 - don't build mpi programs by default, as Bob's suggestion

lustre/configure.in

@@ -45,6 +45,10 @@ else
 fi
 AC_SUBST(SYSIO)
 
+#build mpi-tests 
+AC_ARG_ENABLE(mpitests, [  --enable-mpitests disable build liblustre mpi tests])
+AM_CONDITIONAL(MPITESTS, test x$enable_mpitests = xyes, Build MPI Tests)
+
 # snap compilation 
 AC_ARG_ENABLE(snapfs, [  --enable-snapfs build snapfs])
 AM_CONDITIONAL(SNAPFS, test x$enable_snapfs = xyes)

lustre/liblustre/tests/Makefile.am

@@ -15,8 +15,13 @@ LLIB_EXEC= ../liblustre.a -lpthread
 noinst_LIBRARIES = libtestcommon.a
 libtestcommon_a_SOURCES = test_common.c
 
-bin_PROGRAMS = echo_test sanity recovery_small replay_single test_lock_cancel \
-    replay_ost_single
+def_tests = echo_test sanity recovery_small replay_single replay_ost_single
+
+if MPITESTS
+bin_PROGRAMS = $(def_tests) test_lock_cancel
+else
+bin_PROGRAMS = $(def_tests)
+endif
 
 echo_test_SOURCES = echo_test.c  ../../utils/parser.c ../../utils/obd.c ../../utils/lustre_cfg.c
 echo_test_LDADD = ../liblsupport.a $(LIBREADLINE) -lpthread 
@@ -34,12 +39,14 @@ replay_single_SOURCES = replay_single.c
 replay_single_LDADD := ./libtestcommon.a $(LLIB_EXEC)
 replay_single_DEPENDENCIES = $(top_srcdir)/liblustre/liblustre.a
 
-test_lock_cancel_SOURCES = test_lock_cancel.c
-test_lock_cancel_LDADD :=  $(LLIB_EXEC) -lmpi -llam
-
 replay_ost_single_SOURCES = replay_ost_single.c
 replay_ost_single_LDADD := ./libtestcommon.a $(LLIB_EXEC)
 replay_ost_single_DEPENDENCIES = $(top_srcdir)/liblustre/liblustre.a
 
+if MPITESTS
+test_lock_cancel_SOURCES = test_lock_cancel.c
+test_lock_cancel_LDADD :=  $(LLIB_EXEC) -lmpi -llam
+endif
+
 include $(top_srcdir)/Rules