[C-mpi-commits] SF.net SVN: c-mpi:[8]

[<jmw...@us...>]

Revision: 8
          http://c-mpi.svn.sourceforge.net/c-mpi/?rev=8&view=rev
Author:   jmwozniak
Date:     2010-04-20 04:16:55 +0000 (Tue, 20 Apr 2010)

Log Message:
-----------
Using only one MPIRPC. 

Modified Paths:
--------------
    Makefile.in
    configure.ac

Modified: Makefile.in
===================================================================
--- Makefile.in	2010-04-20 04:16:40 UTC (rev 7)
+++ Makefile.in	2010-04-20 04:16:55 UTC (rev 8)
@@ -75,14 +75,6 @@
 # DISKSIM location
 DISKSIM=@USE_DISKSIM@
 
-# MPIRPC choice
-ifeq (@USE_MPIRPC_1@,1)
-	MPIRPC_DIR = src/mpirpc-1
-endif
-ifeq (@USE_MPIRPC_2@,1)
-	MPIRPC_DIR = src/mpirpc-2
-endif
-
 # configure default is silent, unless --enable-verbose-build in
 # which case QUIET_COMPILE will _not_ be defined.  Further allow
 # silence to be overriden with "make V=1".
@@ -484,7 +476,7 @@
 
 endif
 
-unpublish: src/mpirpc-2/unpublish.o $(CMPI)
+unpublish: src/mpirpc/unpublish.o $(CMPI)
 	$(Q) "  MPICC           $(@)"
 	$(E)$(MPICC) $(<) $(CMPI) $(LIBS) -o $(@)
 

Modified: configure.ac
===================================================================
--- configure.ac	2010-04-20 04:16:40 UTC (rev 7)
+++ configure.ac	2010-04-20 04:16:55 UTC (rev 8)
@@ -360,10 +360,8 @@
 		  [use dense-1 table implementation]),
 		 [AC_MSG_RESULT( [using dense-1 table implementation...] )
 		  AC_DEFINE([USE_TABLE_DENSE_1], [1], [Using DENSE-1])
-                  AC_DEFINE([USE_MPIRPC_2],      [1], [Using MPIRPC-2])
  		  AC_DEFINE([USE_COMM_WORLD],    [1], [Using MPI_COMM_WORLD])
 		  USE_TABLE_DENSE_1=1
-                  USE_MPIRPC_2=1
                   USE_COMM_WORLD=1],
  		 [USE_TABLE_DENSE_1=0])
 
@@ -373,10 +371,8 @@
 		  [use kademlia-2A implementation]),
  		 [AC_MSG_RESULT([using kademlia-2A implementation...])
 		  AC_DEFINE([USE_TABLE_KDA_2A], [1], [Using Kademlia-2A])
-                  AC_DEFINE([USE_MPIRPC_2],     [1], [Using MPIRPC-2])
  		  AC_DEFINE([USE_COMM_WORLD],   [1], [Using MPI_COMM_WORLD])
 		  USE_TABLE_KDA_2A=1
-                  USE_MPIRPC_2=1
                   USE_COMM_WORLD=1],
                  [USE_TABLE_KDA_2A=0])
 
@@ -387,22 +383,16 @@
  		 [AC_MSG_RESULT([using kademlia-2B implementation...])
 		  AC_DEFINE([USE_TABLE_KDA_2B], [1],
 		            [Using Kademlia-2B])
-                  AC_DEFINE([USE_MPIRPC_2],     [1],
-                            [Using MPIRPC-2])
  		  AC_DEFINE([USE_COMM_WORLD],   [0],
                             [Not using MPI_COMM_WORLD])
 		  USE_TABLE_KDA_2B=1
-                  USE_MPIRPC_2=1
 		  USE_COMM_WORLD=0],
                  [USE_TABLE_KDA_2B=0])
 
 dnl Table results:
 AC_SUBST(USE_TABLE_DENSE_1)
-AC_SUBST(USE_TABLE_KDA_1)
 AC_SUBST(USE_TABLE_KDA_2A)
 AC_SUBST(USE_TABLE_KDA_2B)
-AC_SUBST(USE_MPIRPC_1)
-AC_SUBST(USE_MPIRPC_2)
 AC_SUBST(USE_COMM_WORLD)
 
 AC_ARG_ENABLE([driver],


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.