From d8529fea1587c0855d50da50714ccc965d20476b Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Wed, 14 Dec 2011 19:36:08 +0000
Subject: [PATCH] Build a static version of clib to use with Python on Linux

---
 Cantera/clib/SConscript   | 21 ++++++++++++++-------
 Cantera/python/SConscript |  6 +++++-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/Cantera/clib/SConscript b/Cantera/clib/SConscript
index c78bfecd6..47a85d9e3 100644
--- a/Cantera/clib/SConscript
+++ b/Cantera/clib/SConscript
@@ -3,11 +3,18 @@ from buildutils import *
 Import('env', 'buildTargets', 'installTargets')
 
 localenv = env.Clone()
-lib = localenv.SharedLibrary(pjoin('../../lib', 'clib'),
-                             source=mglob(localenv, 'src', 'cpp'),
-                             LIBS=env['cantera_libs'])
-env['clib_shared'] = lib
 
-inst = localenv.Install('$ct_libdir', lib)
-buildTargets.extend(lib)
-installTargets.extend(inst)
+if localenv['OS'] == 'Windows':
+    lib = localenv.SharedLibrary(pjoin('../../lib', 'clib'),
+                                 source=mglob(localenv, 'src', 'cpp'),
+                                 LIBS=env['cantera_libs'])
+    env['clib_shared'] = lib
+    inst = localenv.Install('$ct_libdir', lib)
+    buildTargets.extend(lib)
+    installTargets.extend(inst)
+
+static_lib = localenv.Library(pjoin('../../lib', 'clib'),
+                              source=mglob(localenv, 'src', 'cpp'))
+inst_static = localenv.Install('$ct_libdir', static_lib)
+buildTargets.extend(static_lib)
+installTargets.extend(inst_static)
diff --git a/Cantera/python/SConscript b/Cantera/python/SConscript
index 82d6f9ab4..29dfcf138 100644
--- a/Cantera/python/SConscript
+++ b/Cantera/python/SConscript
@@ -17,8 +17,12 @@ if localenv['OS'] == 'Windows':
 make_setup = localenv.SubstFile('setup.py', 'setup.py.in')
 
 if env['python_package'] == 'full':
+    libs = ['clib']
+    if localenv['OS'] != 'Windows':
+        libs.extend(env['cantera_libs'])
+
     pymodule = localenv.SharedLibrary('Cantera/_cantera', ['src/pycantera.cpp'],
-                                      LIBS='clib',
+                                      LIBS=libs,
                                       SHLIBPREFIX='',
                                       SHLIBSUFFIX=gcv('SO'))
     buildTargets.extend(pymodule)