[Dsim-svn] SF.net SVN: dsim:[47] trunk/dsim/configure.ac

[<den...@us...>]

Revision: 47
          http://dsim.svn.sourceforge.net/dsim/?rev=47&view=rev
Author:   denis_arnaud
Date:     2010-01-16 22:48:31 +0000 (Sat, 16 Jan 2010)

Log Message:
-----------
[Conf] Improved the M4 macro files for MySQL, SOCI, Boost, MPICH2 and OpenMPI.

Modified Paths:
--------------
    trunk/dsim/configure.ac

Modified: trunk/dsim/configure.ac
===================================================================
--- trunk/dsim/configure.ac	2010-01-07 19:49:16 UTC (rev 46)
+++ trunk/dsim/configure.ac	2010-01-16 22:48:31 UTC (rev 47)
@@ -169,21 +169,22 @@
 AC_SUBST(PYTHON_ADD_LIBS)
 
 # -----------------------------------------------------------
-# MPICH2: http://www.mcs.anl.gov/research/projects/mpich2
-# Note: Boost.MPI depends on MPICH2, rather than on OpenMPI
+# OpenMPI: http://www.open-mpi.org
 # -----------------------------------------------------------
-AX_MPICH2
-AC_SUBST(MPICH2_VERSION)
-AC_SUBST(MPICH2_CFLAGS)
-AC_SUBST(MPICH2_LIBS)
+#AX_OPENMPI
+#AC_SUBST(MPIGEN_VERSION)
+#AC_SUBST(MPIGEN_CFLAGS)
+#AC_SUBST(MPIGEN_LIBS)
 
 # -----------------------------------------------------------
-# OpenMPI: http://www.open-mpi.org
+# MPICH2: http://www.mcs.anl.gov/research/projects/mpich2
+# Note: Boost.MPI depends on MPICH2 by default, rather than 
+#       on OpenMPI
 # -----------------------------------------------------------
-#AX_OPENMPI
-AC_SUBST(OPENMPI_VERSION)
-AC_SUBST(OPENMPI_CFLAGS)
-AC_SUBST(OPENMPI_LIBS)
+AX_MPICH2
+AC_SUBST(MPIGEN_VERSION)
+AC_SUBST(MPIGEN_CFLAGS)
+AC_SUBST(MPIGEN_LIBS)
 
 # ---------------------------------------------------------------
 # Support for Boost (Extension of the STL): http://www.boost.org
@@ -518,6 +519,26 @@
 )
 AC_OUTPUT
 
+# OpenMPI
+if test "x$HAVE_OPENMPI" = "x1"; then
+   OPENMPI_OUTPUT="  - OPENMPI ........... :
+    o OPENMPI_VERSION . : ${MPIGEN_VERSION}
+    o OPENMPI_CFLAGS .. : ${MPIGEN_CFLAGS}
+    o OPENMPI_LIBS .... : ${MPIGEN_LIBS}"
+else
+   OPENMPI_OUTPUT="  - OPENMPI ........... : No"
+fi
+
+# MPICH2
+if test "x$HAVE_MPICH2" = "x1"; then
+   MPICH2_OUTPUT="  - MPICH2 ............ :
+    o MPICH2_VERSION .. : ${MPIGEN_VERSION}
+    o MPICH2_CFLAGS ... : ${MPIGEN_CFLAGS}
+    o MPICH2_LIBS ..... : ${MPIGEN_LIBS}"
+else
+   MPICH2_OUTPUT="  - MPICH2 ............ : No"
+fi
+
 echo "
 ------------------------------------------------------------------------------
 $PACKAGE-$VERSION library configuration:
@@ -565,21 +586,15 @@
     o GSL_CFLAGS ...... : ${GSL_CFLAGS}
     o GSL_LIBS ........ : ${GSL_LIBS}
 
-  - OPENMPI ........... :
-    o OPENMPI_VERSION . : ${OPENMPI_VERSION}
-    o OPENMPI_CFLAGS .. : ${OPENMPI_CFLAGS}
-    o OPENMPI_LIBS .... : ${OPENMPI_LIBS}
+${OPENMPI_OUTPUT}
 
-  - MPICH2 ............ :
-    o MPICH2_VERSION .. : ${MPICH2_VERSION}
-    o MPICH2_CFLAGS ... : ${MPICH2_CFLAGS}
-    o MPICH2_LIBS ..... : ${MPICH2_LIBS}
+${MPICH2_OUTPUT}
 
-  - Python ........... :
-    o PYTHON_VERSION . : ${PYTHON_VERSION}
-    o PYTHON_CFLAGS .. : ${PYTHON_CFLAGS}
-    o PYTHON_LIBS .... : ${PYTHON_LIBS}
-    o PYTHON_ADD_LIBS  : ${PYTHON_ADD_LIBS}
+  - Python ............ :
+    o PYTHON_VERSION .. : ${PYTHON_VERSION}
+    o PYTHON_CFLAGS ... : ${PYTHON_CFLAGS}
+    o PYTHON_LIBS ..... : ${PYTHON_LIBS}
+    o PYTHON_ADD_LIBS . : ${PYTHON_ADD_LIBS}
 
   - Boost ............. :
     o BOOST_VERSION ... : ${BOOST_VERSION}


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