Make things compile (but not link :-)

This commit was SVN r4.

configure.ac

@@ -7,7 +7,7 @@
 # information, see the LICENSE file in the top level directory of the
 # CMPI source distribution.
 #
-# $Id: configure.ac,v 1.2 2003/11/22 16:40:48 jsquyres Exp $
+# $Id: configure.ac,v 1.3 2003/11/22 16:57:54 jsquyres Exp $
 #
 
 
@@ -94,6 +94,7 @@ AH_TOP([/* -*- c -*-
 #ifndef CMPI_CONFIG_H
 #define CMPI_CONFIG_H
 ])
+AH_BOTTOM([#endif /* CMPI_CONFIG_H */])
 
 # What kind of machine are we on?
 
@@ -298,9 +299,11 @@ AC_CONFIG_FILES([
 
     src/Makefile
     src/include/Makefile
+
     src/mpi/Makefile
     src/mpi/communicator/Makefile
     src/mpi/datatype/Makefile
+
     src/tools/Makefile
     src/tools/wrappers/Makefile
 

src/include/Makefile.am

@@ -7,14 +7,16 @@
 # information, see the LICENSE file in the top level directory of the
 # CMPI source distribution.
 #
-# $Id: Makefile.am,v 1.1 2003/11/22 16:36:25 jsquyres Exp $
+# $Id: Makefile.am,v 1.2 2003/11/22 16:57:54 jsquyres Exp $
 #
 
 include $(top_srcdir)/config/Makefile.options
 
 noinst_HEADERS	= \
 		communicator.h \
-		datatype.h
+		datatype.h \
+		group.h \
+		totalview.h
 
 include_HEADERS	= \
 		cmpi_config.h \

src/include/mpi.h

@@ -6,19 +6,20 @@
  * information, see the LICENSE file in the top level directory of the
  * CMPI source distribution.
  * 
- * $Id: mpi.h,v 1.1 2003/11/22 16:36:25 jsquyres Exp $
+ * $Id: mpi.h,v 1.2 2003/11/22 16:57:54 jsquyres Exp $
  */
 
-#ifndef CMPI_COMMUNICATOR_H
-#define CMPI_COMMUNICATOR_H
+#ifndef CMPI_H
+#define CMPI_H
 
 #include <cmpi_config.h>
 
 #define MPI_SUCCESS 0
 
-#define MPI_MAX_OBJECT_NAME	64
+#define MPI_MAX_OBJECT_NAME 64
 
-typedef int MPI_Comm;
+typedef struct cmpi_communicator *MPI_Comm;
+typedef struct cmpi_group *MPI_Group;
 typedef struct cmpi_datatype *MPI_Datatype;
 
 extern MPI_Comm MPI_COMM_NULL;
@@ -28,4 +29,4 @@ extern MPI_Comm MPI_COMM_SELF;
 extern MPI_Datatype MPI_TYPE_NULL;
 
 
-#endif /* CMPI_COMMUNICATOR_H */
+#endif /* CMPI_H */

src/mpi/interface/c/comm_set_name.c

@@ -6,12 +6,14 @@
  * information, see the LICENSE file in the top level directory of the
  * CMPI source distribution.
  * 
- * $Id: comm_set_name.c,v 1.1 2003/11/22 16:36:26 jsquyres Exp $
+ * $Id: comm_set_name.c,v 1.2 2003/11/22 16:57:54 jsquyres Exp $
  */
 
 #include <string.h>
 
 #include <mpi.h>
+#include <communicator.h>
+#include <totalview.h>
 
 
 int