From 4fd8d91d5bc0fced39a78375c8b50014e581e6ad Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Fri, 2 Jan 2004 01:53:00 +0000 Subject: [PATCH] *** empty log message *** --- config/configure | 17 ++++++++++++----- configure | 27 +++++++++++++++++---------- examples/cxx/kinetics_example2.cpp | 2 +- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/config/configure b/config/configure index 482928a7c..5b240547e 100755 --- a/config/configure +++ b/config/configure @@ -1476,10 +1476,17 @@ _ACEOF if test -z "$MAKE"; then MAKE='make'; fi -#if test -z "$ARCHIVE"; then ARCHIVE='ar ruv'; fi +#----------- ARCHIVE -------------------- + +if test "x${OS_IS_DARWIN}" = "x1"; then +ARCHIVE='libtool -static -o' +fi + + + +#---------------------------------------- -#if test -z "$SOEXT"; then SOEXT='so'; fi if test -z "$SHARED"; then SHARED='-shared'; fi @@ -3171,7 +3178,7 @@ fi # Provide some information about the compiler. -echo "$as_me:3174:" \ +echo "$as_me:3181:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -3348,7 +3355,7 @@ _ACEOF # flags. ac_save_FFLAGS=$FFLAGS FFLAGS="$FFLAGS $ac_verb" -(eval echo $as_me:3351: \"$ac_link\") >&5 +(eval echo $as_me:3358: \"$ac_link\") >&5 ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` echo "$ac_f77_v_output" >&5 FFLAGS=$ac_save_FFLAGS @@ -3428,7 +3435,7 @@ _ACEOF # flags. ac_save_FFLAGS=$FFLAGS FFLAGS="$FFLAGS $ac_cv_prog_f77_v" -(eval echo $as_me:3431: \"$ac_link\") >&5 +(eval echo $as_me:3438: \"$ac_link\") >&5 ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` echo "$ac_f77_v_output" >&5 FFLAGS=$ac_save_FFLAGS diff --git a/configure b/configure index 30fedb0fb..55816e4c5 100755 --- a/configure +++ b/configure @@ -19,9 +19,6 @@ # so that it will not be overwritten if you update the source # distribution. -# Any parameters you are unsure of may be commented out, and -# 'configure' will attempt to find suitable values for your system. - ####################################################################### CANTERA_VERSION=${CANTERA_VERSION:="1.5.3"} @@ -39,21 +36,31 @@ CANTERA_VERSION=${CANTERA_VERSION:="1.5.3"} #------------ Python ------------------------------------------------- -# Set this if you want to build the Cantera Python interface. Python -# must be installed on your system first, since the build process runs -# a python script. Python 2.0 or greater is required. Set PYTHON_CMD -# to the path to the Python interpreter to use, if there is more than -# one on your system. +# Cantera now requires that the Python interface be built, since it +# uses Python to process input files, even when Cantera is used from +# another language (e.g. MATLAB or C++). Python 2.0 or greater is +# required, and the Numeric extensions for Python are needed too. See +# file INSTALLING for more details. # +# The configure process will attempt to find the Python interpreter on +# your system. However, if there is more than one and you want a +# specific interpreter to be used, then define PYTHON_CMD to be the +# full path to the desired Python interpreter. This allows you, for +# example, to build your own private Python interpreter and use it +# instead of the system Python interpreter. -BUILD_PYTHON_INTERFACE=${BUILD_PYTHON_INTERFACE:="y"} +BUILD_PYTHON_INTERFACE=${BUILD_PYTHON_INTERFACE:="y"} # must be "y" #PYTHON_CMD=${PYTHON_CMD:="python"} + + #----------- Matlab -------------------------------------------------- # Set this to "y" if you want to build the Matlab toolbox. Matlab must # be installed on your system first, since the build process runs a -# Matlab script. +# Matlab script. If this is set to "y" but Matlab is not found, the +# Matlab toolbox will not be built. + BUILD_MATLAB_TOOLBOX=${BUILD_MATLAB_TOOLBOX:="y"} diff --git a/examples/cxx/kinetics_example2.cpp b/examples/cxx/kinetics_example2.cpp index 136fafaa8..dfe2becd2 100755 --- a/examples/cxx/kinetics_example2.cpp +++ b/examples/cxx/kinetics_example2.cpp @@ -89,7 +89,7 @@ int kinetics_example2(int job) { // make a Tecplot data file and an Excel spreadsheet - string plotTitle = "kinetics example 1: constant-pressure ignition"; + string plotTitle = "kinetics example 2: constant-pressure ignition"; plotSoln("kin2.dat", "TEC", plotTitle, gas, soln); plotSoln("kin2.csv", "XL", plotTitle, gas, soln);