resolve conflict between src/STUBS/mpi.h and lib/message/cslib/src/STUBS_MPI/mpi.h

lib/message/cslib/src/cslib.cpp

@@ -12,7 +12,11 @@
    See the README file in the top-level CSlib directory.
 ------------------------------------------------------------------------- */
 
+#ifdef MPI_YES
 #include <mpi.h>
+#else
+#include <mpi_dummy.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

lib/message/cslib/src/cslib_wrap.cpp

@@ -14,7 +14,11 @@
 
 // C style library interface to CSlib class
 
+#ifdef MPI_YES
 #include <mpi.h>
+#else
+#include <mpi_dummy.h>
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>

lib/message/cslib/src/msg.cpp

@@ -12,7 +12,11 @@
    See the README file in the top-level CSlib directory.
 ------------------------------------------------------------------------- */
 
+#ifdef MPI_YES
 #include <mpi.h>
+#else
+#include <mpi_dummy.h>
+#endif
 #include <cstdio>
 #include <cstring>
 #include <cstdlib>

lib/message/cslib/src/msg.h

@@ -15,7 +15,11 @@
 #ifndef MSG_H
 #define MSG_H
 
+#ifdef MPI_YES
 #include <mpi.h>
+#else
+#include <mpi_dummy.h>
+#endif
 
 namespace CSLIB_NS {
 
@@ -37,7 +41,7 @@ class Msg {
   int nfield;
   int *fieldID,*fieldtype,*fieldlen;
   int lengths[2];
-  
+
   void init(int);
   void allocate(int, int &, int *&, int, int &, char *&);
   void *smalloc(int);

lib/message/cslib/src/msg_file.cpp

@@ -12,7 +12,11 @@
    See the README file in the top-level CSlib directory.
 ------------------------------------------------------------------------- */
 
+#ifdef MPI_YES
 #include <mpi.h>
+#else
+#include <mpi_dummy.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

lib/message/cslib/src/msg_mpi_one.cpp

@@ -12,7 +12,11 @@
    See the README file in the top-level CSlib directory.
 ------------------------------------------------------------------------- */
 
+#ifdef MPI_YES
 #include <mpi.h>
+#else
+#include <mpi_dummy.h>
+#endif
 #include <string.h>
 #include <stdlib.h>
 #include <stdint.h>

lib/message/cslib/src/msg_mpi_two.cpp

@@ -12,7 +12,11 @@
    See the README file in the top-level CSlib directory.
 ------------------------------------------------------------------------- */
 
+#ifdef MPI_YES
 #include <mpi.h>
+#else
+#include <mpi_dummy.h>
+#endif
 #include <string.h>
 #include <stdlib.h>
 #include <stdint.h>

lib/message/cslib/src/msg_zmq.cpp

@@ -12,7 +12,11 @@
    See the README file in the top-level CSlib directory.
 ------------------------------------------------------------------------- */
 
+#ifdef MPI_YES
 #include <mpi.h>
+#else
+#include <mpi_dummy.h>
+#endif
 #include <zmq.h>
 #include <string.h>
 #include <stdlib.h>