[cig-commits] r7982 - mc/3D/CitcomS/trunk

[leif at geodynamics.org]

Author: leif
Date: 2007-09-17 18:52:50 -0700 (Mon, 17 Sep 2007)
New Revision: 7982

Modified:
   mc/3D/CitcomS/trunk/configure.ac
   mc/3D/CitcomS/trunk/setup.py
Log:
Fix for Issue129: "CitcomS configured without exchanger still links
with -lExchanger".  Also, use CIT_HEADER_MPI so that configuring
--with-exchanger using MPICH2 works (see Issue14 and Issue57).


Modified: mc/3D/CitcomS/trunk/configure.ac
===================================================================
--- mc/3D/CitcomS/trunk/configure.ac	2007-09-18 01:10:35 UTC (rev 7981)
+++ mc/3D/CitcomS/trunk/configure.ac	2007-09-18 01:52:50 UTC (rev 7982)
@@ -60,6 +60,7 @@
     CIT_PYTHON_SYSCONFIG
 
     # Check for Python modules and packages.
+    export want_exchanger
     CIT_PYTHON_EGG_SETUP
 else
     if test "$want_exchanger" = yes; then
@@ -116,6 +117,7 @@
 
 AC_LANG_PUSH(C++)
 if test "$want_exchanger" != no; then
+    CIT_HEADER_MPI
     save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$PYTHON_EGG_CPPFLAGS $CPPFLAGS"
     AC_CHECK_HEADERS([Exchanger/DIM.h], [], [

Modified: mc/3D/CitcomS/trunk/setup.py
===================================================================
--- mc/3D/CitcomS/trunk/setup.py	2007-09-18 01:10:35 UTC (rev 7981)
+++ mc/3D/CitcomS/trunk/setup.py	2007-09-18 01:52:50 UTC (rev 7982)
@@ -6,13 +6,19 @@
 
 install_requires = ['pythia[mpi] >= 0.8.1.0, < 0.8.2a']
 
-# Use Exchanger if it's available.
+import os
+want_exchanger = os.environ.get('want_exchanger', 'auto')
 exchanger = "Exchanger >= 1, < 2a"
-try:
-    require(exchanger)
-except Exception, e:
-    pass
-else:
+if want_exchanger == 'auto':
+    # Use Exchanger if it's available.
+    try:
+        require(exchanger)
+    except Exception, e:
+        pass
+    else:
+        install_requires.append(exchanger)
+elif want_exchanger == 'yes':
+    # Require Exchanger.
     install_requires.append(exchanger)
 
 setup(