Build starpu_replay twice, once without MPI and once with

smpicc does horrible things which won't work with a non-smpi execution,
so better have two binaries.

configure.ac

@@ -3567,7 +3567,7 @@ AC_OUTPUT([
 	Makefile
 	src/Makefile
 	tools/Makefile
-	tools/replay/Makefile
+	tools/replay-mpi/Makefile
 	tools/starpu_env
 	tools/starpu_codelet_profile
 	tools/starpu_codelet_histo_profile

tools/Makefile.am

@@ -20,10 +20,6 @@ include $(top_srcdir)/starpu.mk
 
 SUBDIRS =
 
-if STARPU_SIMGRID
-SUBDIRS += replay
-endif
-
 AM_CFLAGS = $(HWLOC_CFLAGS) $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(STARPU_COI_CPPFLAGS) $(GLOBAL_AM_CFLAGS)
 LIBS = $(top_builddir)/src/@LIBSTARPU_LINK@ @LIBS@ $(FXT_LIBS)
 AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/tools/ -I$(top_srcdir)/mpi/ -I$(top_builddir)/src -I$(top_srcdir)/src
@@ -395,6 +391,20 @@ bin_PROGRAMS += 			\
 	starpu_lp2paje			\
 	starpu_perfmodel_recdump
 
+if STARPU_SIMGRID
+bin_PROGRAMS += 			\
+	starpu_replay
+
+starpu_replay_SOURCES = \
+	starpu_replay.c \
+	starpu_replay_sched.c
+
+if STARPU_USE_MPI
+SUBDIRS += replay-mpi
+endif
+
+endif
+
 starpu_perfmodel_plot_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(FXT_CFLAGS)
 
 if STARPU_LONG_CHECK

tools/replay/Makefile.am

@@ -22,7 +22,7 @@ SUBDIRS =
 
 AM_CFLAGS = $(HWLOC_CFLAGS) $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(STARPU_COI_CPPFLAGS) $(GLOBAL_AM_CFLAGS)
 LIBS = $(top_builddir)/src/@LIBSTARPU_LINK@ @LIBS@ $(FXT_LIBS)
-AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/tools/ -I$(top_srcdir)/mpi/ -I$(top_builddir)/src -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/tools/ -I$(top_srcdir)/mpi/ -I$(top_builddir)/src -I$(top_srcdir)/src -DSTARPU_REPLAY_MPI
 AM_LDFLAGS = @STARPU_EXPORT_DYNAMIC@ $(STARPU_COI_LDFLAGS) $(STARPU_SCIF_LDFLAGS)
 
 CC=$(CC_OR_MPICC)
@@ -33,8 +33,8 @@ LIBS += ../../mpi/src/libstarpumpi-@STARPU_EFFECTIVE_VERSION@.la
 AM_CPPFLAGS += -I$(top_srcdir)/mpi/include
 endif
 
-bin_PROGRAMS = starpu_replay
+bin_PROGRAMS = starpu_replay_mpi
 
-starpu_replay_SOURCES = \
-	starpu_replay.c \
-	starpu_replay_sched.c
+starpu_replay_mpi_SOURCES = \
+	../starpu_replay.c \
+	../starpu_replay_sched.c