From 3ae5bf0ef1e9fe8cc8802ed127b9b976dd40a8a4 Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Wed, 9 Jan 2008 15:37:20 +0000 Subject: [PATCH] removed try/except --- Cantera/python/setup.py.in | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Cantera/python/setup.py.in b/Cantera/python/setup.py.in index 757643a30..fb40177d6 100644 --- a/Cantera/python/setup.py.in +++ b/Cantera/python/setup.py.in @@ -7,9 +7,11 @@ except: libs = [] platform = sys.platform -flibstr = '@FLIBS@' -f1 = flibstr.replace('-l', ' ') -flibs = f1.split() +flibs = [] +if @build_with_f2c@ <> 1: + flibstr = '@FLIBS@' + f1 = flibstr.replace('-l', ' ') + flibs = f1.split() linkargs = '@LCXX_FLAGS@' @@ -20,7 +22,6 @@ incdirs=["../../build/include", "src", "../clib/src"] if numarray_incl <> '': incdirs.append(numarray_incl) - bllibstr = "@BLAS_LAPACK_LIBS@" bllibs = bllibstr.replace('-l',' ') bllist = bllibs.split() @@ -57,8 +58,8 @@ if platform == "win32": "cantera"] + bllist + cvlist + ["ctbase", "ctmath", "tpx"] else: libs = ["clib"] + locallibs - if flibs: - libs = libs + #if flibs: + # libs = libs #libs = ["clib", "zeroD","oneD", "kinetics", "transport", # "equil", "ctnumerics", "converters"] + thermolib + bllist + cvlist + ["ctbase", "ctmath", "tpx", "boost_thread-mt-1_34"]