*** empty log message ***
This commit is contained in:
Dave Goodwin
parent
542c890db6
commit
b65540f514
8 changed files with 148 additions and 119 deletions
|
|
@ -24,7 +24,7 @@ namespace Cantera {
|
|||
}
|
||||
|
||||
void error(const std::string& msg) {
|
||||
string err = "error("+msg+");";
|
||||
std::string err = "error("+msg+");";
|
||||
mexEvalString(err.c_str());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,27 +1,37 @@
|
|||
|
||||
import sys
|
||||
|
||||
bindir = '/usr/local/bin'
|
||||
libdir = '/Users/dgg/dv/sf/cantera/build/lib/powerpc-apple-darwin7.3.0'
|
||||
incdir = '/Users/dgg/dv/sf/cantera/build/include'
|
||||
libs = '-lclib -loneD -lzeroD -ltransport -lcantera -lrecipes -lcvode -lctlapack -lctmath -lctblas -ltpx -lg2c -lgcc'
|
||||
bindir = 'c:/cantera/bin'
|
||||
libdir = 'd:/dgg/dv/sf/cantera/build/lib/i686-pc-win32'
|
||||
incdir = 'd:/dgg/dv/sf/cantera/build/include'
|
||||
dflibdir = 'D:\Program Files\Microsoft Visual Studio\DF98\LIB'
|
||||
|
||||
libs = ['clib', 'oneD', 'zeroD', 'transport', 'cantera', 'recipes',
|
||||
'cvode', 'ctlapack', 'ctmath', 'ctblas', 'tpx']
|
||||
|
||||
f = open('setup.m','w')
|
||||
f.write('cd cantera\nbuildux\nexit\n')
|
||||
f.write('cd cantera\nbuild_cantera\nexit\n')
|
||||
f.close()
|
||||
|
||||
fb = open('cantera/buildux.m','w')
|
||||
fb = open('cantera/build_cantera.m','w')
|
||||
fb.write("""
|
||||
disp('building Cantera..');
|
||||
mex private/ctmethods.cpp private/ctfunctions.cpp ...
|
||||
mex -I"""+incdir+""" private/ctmethods.cpp private/ctfunctions.cpp ...
|
||||
private/xmlmethods.cpp private/phasemethods.cpp ...
|
||||
private/thermomethods.cpp private/kineticsmethods.cpp ...
|
||||
private/transportmethods.cpp private/reactormethods.cpp ...
|
||||
private/reactornetmethods.cpp ...
|
||||
private/wallmethods.cpp private/flowdevicemethods.cpp ...
|
||||
private/funcmethods.cpp ...
|
||||
private/funcmethods.cpp ...
|
||||
private/onedimmethods.cpp private/surfmethods.cpp private/write.cpp ...
|
||||
"""+'-I'+incdir+' -L'+libdir+' '+libs+'\n'+"""disp('done.');
|
||||
""")
|
||||
s = ''
|
||||
for lib in libs:
|
||||
s += ' '+libdir+'/'+lib+'.lib ...\n'
|
||||
fb.write(s)
|
||||
fb.write(' "'+dflibdir+'/dformd.lib" ...\n')
|
||||
fb.write(' "'+dflibdir+'/dfconsol.lib" ...\n')
|
||||
fb.write(' "'+dflibdir+'/dfport.lib" \n')
|
||||
fb.close()
|
||||
|
||||
fp = open('cantera/ctbin.m','w')
|
||||
|
|
|
|||
|
|
@ -20,7 +20,9 @@ mex -I"""+incdir+""" private/ctmethods.cpp private/ctfunctions.cpp ...
|
|||
private/xmlmethods.cpp private/phasemethods.cpp ...
|
||||
private/thermomethods.cpp private/kineticsmethods.cpp ...
|
||||
private/transportmethods.cpp private/reactormethods.cpp ...
|
||||
private/reactornetmethods.cpp ...
|
||||
private/wallmethods.cpp private/flowdevicemethods.cpp ...
|
||||
private/funcmethods.cpp ...
|
||||
private/onedimmethods.cpp private/surfmethods.cpp private/write.cpp ...
|
||||
""")
|
||||
s = ''
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ endif
|
|||
|
||||
clean:
|
||||
@PYTHON_CMD@ setup.py clean
|
||||
rm -f _build; rm -f _winbuild
|
||||
cd src; rm -f *.o
|
||||
|
||||
depends:
|
||||
|
|
|
|||
|
|
@ -311,10 +311,9 @@ namespace Cantera {
|
|||
// CANTERA_ROOT is defined in file config.h. This file is written
|
||||
// during the build process (unix), and points to the directory
|
||||
// specified by the 'prefix' option to 'configure', or else to
|
||||
// /usr/local/cantera. This will generally not be defined under
|
||||
// Windows.
|
||||
#ifdef CANTERA_ROOT
|
||||
string datadir = string(CANTERA_ROOT) + "/data";
|
||||
// /usr/local/cantera.
|
||||
#ifdef CANTERA_DATA
|
||||
string datadir = string(CANTERA_DATA);
|
||||
dirs.push_back(datadir);
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ typedef int ftnlen; // Fortran hidden string length type
|
|||
|
||||
// used to find data files
|
||||
#undef CANTERA_ROOT
|
||||
#undef CANTERA_DATA
|
||||
|
||||
#undef INCL_PURE_FLUIDS
|
||||
|
||||
|
|
|
|||
204
config/configure
vendored
204
config/configure
vendored
|
|
@ -817,6 +817,10 @@ cat >> confdefs.h <<EOF
|
|||
#define CANTERA_ROOT "$prefix/cantera"
|
||||
EOF
|
||||
|
||||
cat >> confdefs.h <<EOF
|
||||
#define CANTERA_DATA "$ct_datadir"
|
||||
EOF
|
||||
|
||||
|
||||
if test -z "$MAKE"; then MAKE='make'; fi
|
||||
|
||||
|
|
@ -1049,13 +1053,14 @@ BUILD_CLIB=1
|
|||
# Python Interface
|
||||
#
|
||||
BUILD_PYTHON=1
|
||||
WIN_PYTHON_CMD=python
|
||||
if test -z "$PYTHON_CMD"; then
|
||||
for ac_prog in python2 python
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1059: checking for $ac_word" >&5
|
||||
echo "configure:1064: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_PYTHON_CMD'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1091,12 +1096,55 @@ test -n "$PYTHON_CMD" && break
|
|||
done
|
||||
test -n "$PYTHON_CMD" || PYTHON_CMD=""none""
|
||||
|
||||
fi
|
||||
if test "$PYTHON_CMD" != "none"; then
|
||||
if test "x$OS_IS_WIN" = "x1"; then
|
||||
PYTHON_CMD=`cygpath -a -w "$PYTHON_CMD" | sed 's/\\\/\\//g'`
|
||||
fi
|
||||
if test "x$OS_IS_WIN" = "x1"; then
|
||||
for ac_prog in pythonw python
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1106: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_WIN_PYTHON_CMD'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
case "$WIN_PYTHON_CMD" in
|
||||
/*)
|
||||
ac_cv_path_WIN_PYTHON_CMD="$WIN_PYTHON_CMD" # Let the user override the test with a path.
|
||||
;;
|
||||
?:/*)
|
||||
ac_cv_path_WIN_PYTHON_CMD="$WIN_PYTHON_CMD" # Let the user override the test with a dos path.
|
||||
;;
|
||||
*)
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||
ac_dummy="$PATH"
|
||||
for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f $ac_dir/$ac_word; then
|
||||
ac_cv_path_WIN_PYTHON_CMD="$ac_dir/$ac_word"
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
WIN_PYTHON_CMD="$ac_cv_path_WIN_PYTHON_CMD"
|
||||
if test -n "$WIN_PYTHON_CMD"; then
|
||||
echo "$ac_t""$WIN_PYTHON_CMD" 1>&6
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
test -n "$WIN_PYTHON_CMD" && break
|
||||
done
|
||||
test -n "$WIN_PYTHON_CMD" || WIN_PYTHON_CMD=""none""
|
||||
|
||||
WIN_PYTHON_CMD=`cygpath -a -w "$WIN_PYTHON_CMD" | sed 's/\\\/\\//g'`
|
||||
echo "Windows Python command: $WIN_PYTHON_CMD"
|
||||
fi
|
||||
else
|
||||
echo "Python command preset to $PYTHON_CMD"
|
||||
fi
|
||||
if test "$PYTHON_CMD" = "none"; then
|
||||
echo
|
||||
echo "********************************************************************"
|
||||
echo "Configuration error. Python is required to build Cantera, but it"
|
||||
|
|
@ -1106,11 +1154,17 @@ else
|
|||
exit 1
|
||||
fi
|
||||
|
||||
if test "x$OS_IS_WIN" = "x1"; then
|
||||
cat >> confdefs.h <<EOF
|
||||
#define PYTHON_EXE "$WIN_PYTHON_CMD"
|
||||
EOF
|
||||
|
||||
else
|
||||
cat >> confdefs.h <<EOF
|
||||
#define PYTHON_EXE "$PYTHON_CMD"
|
||||
EOF
|
||||
|
||||
|
||||
fi
|
||||
|
||||
#
|
||||
# Matlab Interface
|
||||
|
|
@ -1121,7 +1175,7 @@ if test "$BUILD_MATLAB_TOOLBOX" != "n"; then
|
|||
# Extract the first word of "matlab", so it can be a program name with args.
|
||||
set dummy matlab; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1125: checking for $ac_word" >&5
|
||||
echo "configure:1179: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_MATLAB_CMD'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1155,6 +1209,8 @@ else
|
|||
fi
|
||||
|
||||
if test "$MATLAB_CMD" != "none"; then BUILD_MATLAB=1; BUILD_CLIB=1; fi
|
||||
else
|
||||
echo "Matlab command preset to $(MATLAB_CMD)$"
|
||||
fi
|
||||
fi
|
||||
if test "x$OS_IS_WIN" = "x1"; then
|
||||
|
|
@ -1183,7 +1239,7 @@ export_name=$target
|
|||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||||
# ./install, which can be erroneously created by make from ./install.sh.
|
||||
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
|
||||
echo "configure:1187: checking for a BSD compatible install" >&5
|
||||
echo "configure:1243: checking for a BSD compatible install" >&5
|
||||
if test -z "$INSTALL"; then
|
||||
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1246,7 +1302,7 @@ do
|
|||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1250: checking for $ac_word" >&5
|
||||
echo "configure:1306: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1278,7 +1334,7 @@ test -n "$CXX" || CXX="gcc"
|
|||
|
||||
|
||||
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:1282: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
|
||||
echo "configure:1338: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
|
||||
|
||||
ac_ext=C
|
||||
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
|
|
@ -1289,12 +1345,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
|
|||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
|
||||
#line 1293 "configure"
|
||||
#line 1349 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:1298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
ac_cv_prog_cxx_works=yes
|
||||
# If we can't run a trivial program, we are probably using a cross compiler.
|
||||
if (./conftest; exit) 2>/dev/null; then
|
||||
|
|
@ -1320,12 +1376,12 @@ if test $ac_cv_prog_cxx_works = no; then
|
|||
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
|
||||
fi
|
||||
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
||||
echo "configure:1324: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "configure:1380: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
|
||||
cross_compiling=$ac_cv_prog_cxx_cross
|
||||
|
||||
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
|
||||
echo "configure:1329: checking whether we are using GNU C++" >&5
|
||||
echo "configure:1385: checking whether we are using GNU C++" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1334,7 +1390,7 @@ else
|
|||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
ac_cv_prog_gxx=yes
|
||||
else
|
||||
ac_cv_prog_gxx=no
|
||||
|
|
@ -1353,7 +1409,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
|
|||
ac_save_CXXFLAGS="$CXXFLAGS"
|
||||
CXXFLAGS=
|
||||
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
|
||||
echo "configure:1357: checking whether ${CXX-g++} accepts -g" >&5
|
||||
echo "configure:1413: checking whether ${CXX-g++} accepts -g" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1384,61 +1440,10 @@ else
|
|||
fi
|
||||
fi
|
||||
|
||||
for ac_declaration in \
|
||||
''\
|
||||
'#include <stdlib.h>' \
|
||||
'extern "C" void std::exit (int) throw (); using std::exit;' \
|
||||
'extern "C" void std::exit (int); using std::exit;' \
|
||||
'extern "C" void exit (int) throw ();' \
|
||||
'extern "C" void exit (int);' \
|
||||
'void exit (int);'
|
||||
do
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1398 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdlib.h>
|
||||
$ac_declaration
|
||||
int main() {
|
||||
exit (42);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
:
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
continue
|
||||
fi
|
||||
rm -f conftest*
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1416 "configure"
|
||||
#include "confdefs.h"
|
||||
$ac_declaration
|
||||
int main() {
|
||||
exit (42);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
break
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
fi
|
||||
rm -f conftest*
|
||||
done
|
||||
if test -n "$ac_declaration"; then
|
||||
echo '#ifdef __cplusplus' >>confdefs.h
|
||||
echo $ac_declaration >>confdefs.h
|
||||
echo '#endif' >>confdefs.h
|
||||
fi
|
||||
|
||||
|
||||
# Extract the first word of "gcc", so it can be a program name with args.
|
||||
set dummy gcc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1442: checking for $ac_word" >&5
|
||||
echo "configure:1447: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1468,7 +1473,7 @@ if test -z "$CC"; then
|
|||
# Extract the first word of "cc", so it can be a program name with args.
|
||||
set dummy cc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1472: checking for $ac_word" >&5
|
||||
echo "configure:1477: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1519,7 +1524,7 @@ fi
|
|||
# Extract the first word of "cl", so it can be a program name with args.
|
||||
set dummy cl; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1523: checking for $ac_word" >&5
|
||||
echo "configure:1528: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1551,7 +1556,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:1555: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
echo "configure:1560: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
|
||||
ac_ext=c
|
||||
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
|
|
@ -1562,12 +1567,12 @@ cross_compiling=$ac_cv_prog_cc_cross
|
|||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
|
||||
#line 1566 "configure"
|
||||
#line 1571 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:1571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
ac_cv_prog_cc_works=yes
|
||||
# If we can't run a trivial program, we are probably using a cross compiler.
|
||||
if (./conftest; exit) 2>/dev/null; then
|
||||
|
|
@ -1593,12 +1598,12 @@ if test $ac_cv_prog_cc_works = no; then
|
|||
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
|
||||
fi
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
||||
echo "configure:1597: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "configure:1602: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
|
||||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
|
||||
echo "configure:1602: checking whether we are using GNU C" >&5
|
||||
echo "configure:1607: checking whether we are using GNU C" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1607,7 +1612,7 @@ else
|
|||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
ac_cv_prog_gcc=yes
|
||||
else
|
||||
ac_cv_prog_gcc=no
|
||||
|
|
@ -1626,7 +1631,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
|
|||
ac_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS=
|
||||
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
||||
echo "configure:1630: checking whether ${CC-cc} accepts -g" >&5
|
||||
echo "configure:1635: checking whether ${CC-cc} accepts -g" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1659,7 +1664,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for ability to precompile headers""... $ac_c" 1>&6
|
||||
echo "configure:1663: checking for ability to precompile headers" >&5
|
||||
echo "configure:1668: checking for ability to precompile headers" >&5
|
||||
|
||||
if test -n "$GCC"; then
|
||||
msg=`rm -f *h.gch; $CXX testpch.h &> /dev/null`
|
||||
|
|
@ -1671,7 +1676,7 @@ echo "$ac_t""${precompile_headers}" 1>&6
|
|||
|
||||
has_sstream=no
|
||||
echo $ac_n "checking for sstream""... $ac_c" 1>&6
|
||||
echo "configure:1675: checking for sstream" >&5
|
||||
echo "configure:1680: checking for sstream" >&5
|
||||
cat >> testsstream.cpp << EOF
|
||||
#include <sstream>
|
||||
main() {}
|
||||
|
|
@ -1699,7 +1704,7 @@ do
|
|||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1703: checking for $ac_word" >&5
|
||||
echo "configure:1708: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1732,7 +1737,7 @@ done
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:1736: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works" >&5
|
||||
echo "configure:1741: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works" >&5
|
||||
|
||||
ac_ext=f
|
||||
ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
|
||||
|
|
@ -1745,7 +1750,7 @@ cat > conftest.$ac_ext << EOF
|
|||
end
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:1749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
ac_cv_prog_f77_works=yes
|
||||
# If we can't run a trivial program, we are probably using a cross compiler.
|
||||
if (./conftest; exit) 2>/dev/null; then
|
||||
|
|
@ -1771,12 +1776,12 @@ if test $ac_cv_prog_f77_works = no; then
|
|||
{ echo "configure: error: installation or configuration problem: Fortran 77 compiler cannot create executables." 1>&2; exit 1; }
|
||||
fi
|
||||
echo $ac_n "checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
||||
echo "configure:1775: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "configure:1780: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "$ac_t""$ac_cv_prog_f77_cross" 1>&6
|
||||
cross_compiling=$ac_cv_prog_f77_cross
|
||||
|
||||
echo $ac_n "checking whether we are using GNU Fortran 77""... $ac_c" 1>&6
|
||||
echo "configure:1780: checking whether we are using GNU Fortran 77" >&5
|
||||
echo "configure:1785: checking whether we are using GNU Fortran 77" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_g77'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1785,7 +1790,7 @@ else
|
|||
yes
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='$F77 -E conftest.fpp'; { (eval echo configure:1789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
if { ac_try='$F77 -E conftest.fpp'; { (eval echo configure:1794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
ac_cv_prog_g77=yes
|
||||
else
|
||||
ac_cv_prog_g77=no
|
||||
|
|
@ -1800,7 +1805,7 @@ if test $ac_cv_prog_g77 = yes; then
|
|||
ac_save_FFLAGS="$FFLAGS"
|
||||
FFLAGS=
|
||||
echo $ac_n "checking whether $F77 accepts -g""... $ac_c" 1>&6
|
||||
echo "configure:1804: checking whether $F77 accepts -g" >&5
|
||||
echo "configure:1809: checking whether $F77 accepts -g" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_f77_g'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1838,7 +1843,7 @@ if test -n "$G77"; then
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for Fortran 77 libraries""... $ac_c" 1>&6
|
||||
echo "configure:1842: checking for Fortran 77 libraries" >&5
|
||||
echo "configure:1847: checking for Fortran 77 libraries" >&5
|
||||
|
||||
|
||||
if eval "test \"`echo '$''{'ac_cv_flibs'+set}'`\" = set"; then
|
||||
|
|
@ -1998,13 +2003,13 @@ esac
|
|||
|
||||
|
||||
echo $ac_n "checking for object suffix""... $ac_c" 1>&6
|
||||
echo "configure:2002: checking for object suffix" >&5
|
||||
echo "configure:2007: checking for object suffix" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
rm -f conftest*
|
||||
echo 'int i = 1;' > conftest.$ac_ext
|
||||
if { (eval echo configure:2008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
for ac_file in conftest.*; do
|
||||
case $ac_file in
|
||||
*.c) ;;
|
||||
|
|
@ -2022,12 +2027,12 @@ OBJEXT=$ac_cv_objext
|
|||
ac_objext=$ac_cv_objext
|
||||
|
||||
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
|
||||
echo "configure:2026: checking for Cygwin environment" >&5
|
||||
echo "configure:2031: checking for Cygwin environment" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2031 "configure"
|
||||
#line 2036 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
|
|
@ -2038,7 +2043,7 @@ int main() {
|
|||
return __CYGWIN__;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cygwin=yes
|
||||
else
|
||||
|
|
@ -2055,19 +2060,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
|
|||
CYGWIN=
|
||||
test "$ac_cv_cygwin" = yes && CYGWIN=yes
|
||||
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
|
||||
echo "configure:2059: checking for mingw32 environment" >&5
|
||||
echo "configure:2064: checking for mingw32 environment" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2064 "configure"
|
||||
#line 2069 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return __MINGW32__;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_mingw32=yes
|
||||
else
|
||||
|
|
@ -2086,7 +2091,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes
|
|||
|
||||
|
||||
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
|
||||
echo "configure:2090: checking for executable suffix" >&5
|
||||
echo "configure:2095: checking for executable suffix" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2096,7 +2101,7 @@ else
|
|||
rm -f conftest*
|
||||
echo 'int main () { return 0; }' > conftest.$ac_ext
|
||||
ac_cv_exeext=
|
||||
if { (eval echo configure:2100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
if { (eval echo configure:2105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
for file in conftest.*; do
|
||||
case $file in
|
||||
*.c | *.o | *.obj) ;;
|
||||
|
|
@ -2186,7 +2191,7 @@ fi
|
|||
# SO is the extension of shared libraries `(including the dot!)
|
||||
# -- usually .so, .sl on HP-UX, .dll on Cygwin
|
||||
echo $ac_n "checking SO""... $ac_c" 1>&6
|
||||
echo "configure:2190: checking SO" >&5
|
||||
echo "configure:2195: checking SO" >&5
|
||||
if test -z "$SO"
|
||||
then
|
||||
case $ac_sys_system in
|
||||
|
|
@ -2408,6 +2413,7 @@ s%@BUILD_PARTICLES@%$BUILD_PARTICLES%g
|
|||
s%@CT_SHARED_LIB@%$CT_SHARED_LIB%g
|
||||
s%@BUILD_F90@%$BUILD_F90%g
|
||||
s%@PYTHON_CMD@%$PYTHON_CMD%g
|
||||
s%@WIN_PYTHON_CMD@%$WIN_PYTHON_CMD%g
|
||||
s%@BUILD_PYTHON@%$BUILD_PYTHON%g
|
||||
s%@MATLAB_CMD@%$MATLAB_CMD%g
|
||||
s%@BUILD_MATLAB@%$BUILD_MATLAB%g
|
||||
|
|
|
|||
|
|
@ -187,6 +187,7 @@ AC_SUBST(buildbin)
|
|||
AC_DEFINE_UNQUOTED(DARWIN,$OS_IS_DARWIN)
|
||||
AC_DEFINE_UNQUOTED(RXNPATH_FONT,"$RPFONT")
|
||||
AC_DEFINE_UNQUOTED(CANTERA_ROOT,"$prefix/cantera")
|
||||
AC_DEFINE_UNQUOTED(CANTERA_DATA,"$ct_datadir")
|
||||
|
||||
if test -z "$MAKE"; then MAKE='make'; fi
|
||||
AC_SUBST(MAKE)
|
||||
|
|
@ -416,14 +417,18 @@ BUILD_CLIB=1
|
|||
# Python Interface
|
||||
#
|
||||
BUILD_PYTHON=1
|
||||
WIN_PYTHON_CMD=python
|
||||
if test -z "$PYTHON_CMD"; then
|
||||
AC_PATH_PROGS(PYTHON_CMD, python2 python, "none")
|
||||
fi
|
||||
if test "$PYTHON_CMD" != "none"; then
|
||||
if test "x$OS_IS_WIN" = "x1"; then
|
||||
PYTHON_CMD=`cygpath -a -w "$PYTHON_CMD" | sed 's/\\\/\\//g'`
|
||||
fi
|
||||
if test "x$OS_IS_WIN" = "x1"; then
|
||||
AC_PATH_PROGS(WIN_PYTHON_CMD, pythonw python, "none")
|
||||
WIN_PYTHON_CMD=`cygpath -a -w "$WIN_PYTHON_CMD" | sed 's/\\\/\\//g'`
|
||||
echo "Windows Python command: $WIN_PYTHON_CMD"
|
||||
fi
|
||||
else
|
||||
echo "Python command preset to $PYTHON_CMD"
|
||||
fi
|
||||
if test "$PYTHON_CMD" = "none"; then
|
||||
echo
|
||||
echo "********************************************************************"
|
||||
echo "Configuration error. Python is required to build Cantera, but it"
|
||||
|
|
@ -433,8 +438,11 @@ else
|
|||
exit 1
|
||||
fi
|
||||
AC_SUBST(BUILD_PYTHON)
|
||||
if test "x$OS_IS_WIN" = "x1"; then
|
||||
AC_DEFINE_UNQUOTED(PYTHON_EXE,"$WIN_PYTHON_CMD")
|
||||
else
|
||||
AC_DEFINE_UNQUOTED(PYTHON_EXE,"$PYTHON_CMD")
|
||||
|
||||
fi
|
||||
|
||||
#
|
||||
# Matlab Interface
|
||||
|
|
@ -444,6 +452,8 @@ if test "$BUILD_MATLAB_TOOLBOX" != "n"; then
|
|||
if test -z "$MATLAB_CMD"; then
|
||||
AC_PATH_PROG(MATLAB_CMD, matlab, "none")
|
||||
if test "$MATLAB_CMD" != "none"; then BUILD_MATLAB=1; BUILD_CLIB=1; fi
|
||||
else
|
||||
echo "Matlab command preset to $(MATLAB_CMD)$"
|
||||
fi
|
||||
fi
|
||||
if test "x$OS_IS_WIN" = "x1"; then
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue