bug fixes
This commit is contained in:
Dave Goodwin
parent
6e64d22031
commit
7f570c79ca
5 changed files with 20 additions and 9 deletions
|
|
@ -58,14 +58,17 @@ if platform == "win32":
|
|||
else:
|
||||
libs = ["clib"] + locallibs
|
||||
if flibs:
|
||||
libs = libs + flibs
|
||||
libs = libs
|
||||
#libs = ["clib", "zeroD","oneD", "kinetics", "transport",
|
||||
# "equil", "ctnumerics", "converters"] + thermolib + bllist + cvlist + ["ctbase", "ctmath", "tpx", "boost_thread-mt-1_34"]
|
||||
|
||||
if @build_with_f2c@ == 1:
|
||||
libs.append("ctf2c")
|
||||
libs.append("ctf2c")
|
||||
else:
|
||||
libs = libs + flibs
|
||||
|
||||
for d in endlib:
|
||||
libs.append(d)
|
||||
libs.append(d)
|
||||
|
||||
|
||||
# values:
|
||||
|
|
|
|||
8
configure
vendored
8
configure
vendored
|
|
@ -308,7 +308,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BITCOMPILE BITHARDWARE BITCHANGE ldemulationarg CVF_LIBDIR USE_CLIB_DLL local_inst local_python_inst python_prefix python_win_prefix ctversion homedir ct_libdir ct_bindir ct_incdir ct_incroot ct_datadir ct_demodir ct_templdir ct_tutdir ct_docdir ct_dir ct_mandir COMPACT_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os username ctroot buildinc buildlib buildbin MAKE GRAPHVIZDIR ARCHIVE DO_RANLIB RANLIB CXX_DEPENDS USERDIR INCL_USER_CODE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT use_sundials CVODE_LIBS IDA_LIBS sundials_include CANTERA_DEBUG_MODE COMPILE_PURE_FLUIDS phase_object_files phase_header_files COMPILE_IDEAL_SOLUTIONS COMPILE_ELECTROLYTES NEED_CATHERMO COMPILE_KINETICS COMPILE_HETEROKIN COMPILE_RXNPATH WITH_REACTORS KERNEL KERNEL_OBJ BUILD_CK LIB_DIR BOOST_INCLUDE BOOST_LIB build_lapack build_blas BLAS_LAPACK_LIBS BLAS_LAPACK_DIR build_with_f2c build_f2c_lib LOCAL_LIB_DIRS LOCAL_LIBS CT_SHARED_LIB PYTHON_CMD BUILD_PYTHON NUMARRAY_INC_DIR NUMARRAY_HOME CANTERA_PYTHON_HOME CVSTAG MATLAB_CMD BUILD_MATLAB BUILD_CLIB export_name PIC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS ac_ct_CC CXXCPP EGREP SOEXT SHARED CXX_INCLUDES LCXX_FLAGS LCXX_END_LIBS HAVE_STRIPSYMBOLS F77 FFLAGS ac_ct_F77 F90 BUILD_F90 F90FLAGS F90BUILDFLAGS precompile_headers FLIBS OS_IS_DARWIN OS_IS_WIN OS_IS_CYGWIN SHARED_CTLIB mex_ext F77_EXT CXX_EXT OBJ_EXT EXE_EXT math_libs SO LDSHARED EXTRA_LINK TSCOMPARE_abs INSTALL_abs INSTALL_VERBOSE LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BITCOMPILE BITHARDWARE BITCHANGE ldemulationarg CVF_LIBDIR USE_CLIB_DLL local_inst local_python_inst python_prefix python_win_prefix ctversion homedir ct_libdir ct_bindir ct_incdir ct_incroot ct_datadir ct_demodir ct_templdir ct_tutdir ct_docdir ct_dir ct_mandir COMPACT_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os username ctroot buildinc buildlib buildbin MAKE GRAPHVIZDIR ARCHIVE DO_RANLIB RANLIB CXX_DEPENDS USERDIR INCL_USER_CODE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT use_sundials CVODE_LIBS IDA_LIBS sundials_include CANTERA_DEBUG_MODE COMPILE_PURE_FLUIDS phase_object_files phase_header_files COMPILE_IDEAL_SOLUTIONS COMPILE_ELECTROLYTES NEED_CATHERMO COMPILE_KINETICS COMPILE_HETEROKIN COMPILE_RXNPATH WITH_REACTORS KERNEL KERNEL_OBJ BUILD_CK LIB_DIR BOOST_INCLUDE BOOST_LIB build_lapack build_blas BLAS_LAPACK_LIBS BLAS_LAPACK_DIR build_with_f2c build_f2c_lib LOCAL_LIB_DIRS LOCAL_LIBS CT_SHARED_LIB PYTHON_CMD BUILD_PYTHON NUMARRAY_INC_DIR NUMARRAY_HOME CANTERA_PYTHON_HOME CVSTAG MATLAB_CMD BUILD_MATLAB BUILD_CLIB export_name PIC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC CFLAGS ac_ct_CC CXXCPP EGREP SOEXT SHARED CXX_INCLUDES LCXX_FLAGS LCXX_END_LIBS HAVE_STRIPSYMBOLS F77 FFLAGS ac_ct_F77 F90 BUILD_F90 F90FLAGS F90BUILDFLAGS F90LIBS precompile_headers FLIBS OS_IS_DARWIN OS_IS_WIN OS_IS_CYGWIN SHARED_CTLIB mex_ext F77_EXT CXX_EXT OBJ_EXT EXE_EXT math_libs SO LDSHARED EXTRA_LINK TSCOMPARE_abs INSTALL_abs INSTALL_VERBOSE LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -8633,13 +8633,15 @@ EOF
|
|||
f90type=unknown
|
||||
fi
|
||||
#
|
||||
F90LIBS=
|
||||
|
||||
msg=`${F90} --version &> f90out`
|
||||
isgfortran=`grep -c 'GNU Fortran 95' f90out`
|
||||
if test "x${isgfortran}" != "x0"; then
|
||||
f90type="gfortran"
|
||||
f90opts="-fno-second-underscore -I. -I${ct_incdir}"
|
||||
f90buildopts="-fno-second-underscore -I."
|
||||
FLIBS="-lgfortran"
|
||||
F90LIBS="-lgfortran"
|
||||
fi
|
||||
|
||||
isg95=`grep -c 'G95' f90out`
|
||||
|
|
@ -8700,6 +8702,7 @@ F90BUILDFLAGS=${f90buildopts}' '${savef90flags}
|
|||
|
||||
|
||||
|
||||
|
||||
# filename extensions for Fortran 77
|
||||
if test -z "$F77_EXT"; then F77_EXT=f; fi
|
||||
|
||||
|
|
@ -9617,6 +9620,7 @@ s,@F90@,$F90,;t t
|
|||
s,@BUILD_F90@,$BUILD_F90,;t t
|
||||
s,@F90FLAGS@,$F90FLAGS,;t t
|
||||
s,@F90BUILDFLAGS@,$F90BUILDFLAGS,;t t
|
||||
s,@F90LIBS@,$F90LIBS,;t t
|
||||
s,@precompile_headers@,$precompile_headers,;t t
|
||||
s,@FLIBS@,$FLIBS,;t t
|
||||
s,@OS_IS_DARWIN@,$OS_IS_DARWIN,;t t
|
||||
|
|
|
|||
|
|
@ -1193,13 +1193,15 @@ EOF
|
|||
f90type=unknown
|
||||
fi
|
||||
#
|
||||
F90LIBS=
|
||||
|
||||
msg=`${F90} --version &> f90out`
|
||||
isgfortran=`grep -c 'GNU Fortran 95' f90out`
|
||||
if test "x${isgfortran}" != "x0"; then
|
||||
f90type="gfortran"
|
||||
f90opts="-fno-second-underscore -I. -I${ct_incdir}"
|
||||
f90buildopts="-fno-second-underscore -I."
|
||||
FLIBS="-lgfortran"
|
||||
F90LIBS="-lgfortran"
|
||||
fi
|
||||
|
||||
isg95=`grep -c 'G95' f90out`
|
||||
|
|
@ -1246,6 +1248,7 @@ AC_SUBST(BUILD_F90)
|
|||
AC_SUBST(F90)
|
||||
AC_SUBST(F90FLAGS)
|
||||
AC_SUBST(F90BUILDFLAGS)
|
||||
AC_SUBST(F90LIBS)
|
||||
|
||||
AC_OBJEXT
|
||||
AC_EXEEXT
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
#define IEEE_8087
|
||||
#define Arith_Kind_ASL 1
|
||||
#define IEEE_MC68k
|
||||
#define Arith_Kind_ASL 2
|
||||
#define Double_Align
|
||||
#define NANCHECK
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ CXX = @CXX@
|
|||
CXX_FLAGS = @CXXFLAGS@
|
||||
|
||||
# external libraries
|
||||
EXT_LIBS = -lfct -lclib @LOCAL_LIBS@ -lctcxx -lstdc++ @FLIBS@
|
||||
EXT_LIBS = -lfct -lclib @LOCAL_LIBS@ -lctcxx -lstdc++ @F90LIBS@
|
||||
|
||||
# the Fortran 90/95 compiler
|
||||
F90 = @F90@
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue