-
This commit is contained in:
Dave Goodwin
parent
5911a928a5
commit
105c15065d
2 changed files with 58 additions and 16 deletions
61
config/configure
vendored
61
config/configure
vendored
|
|
@ -271,7 +271,7 @@ PACKAGE_STRING=
|
|||
PACKAGE_BUGREPORT=
|
||||
|
||||
ac_unique_file="Cantera.README"
|
||||
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 local_inst ctversion homedir ct_libdir ct_incdir ct_incroot ct_bindir ct_datadir ct_demodir ct_templdir ct_mandir ct_tutdir ct_docdir ct_dir CANTERA_LIBDIR CANTERA_INCDIR CT_TOOLS_BIN CANTERA_BINDIR CANTERA_EXAMPLES_DIR CANTERA_DATADIR username ctroot build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os buildlib MAKE ARCHIVE SOEXT SHARED PIC LCXX_FLAGS LCXX_END_LIBS USERDIR INCL_USER_CODE KERNEL BUILD_CK LIB_DIR LAPACK_LIBRARY build_lapack BLAS_LIBRARY build_blas LOCAL_LIBS CT_SHARED_LIB BUILD_F90 PYTHON_CMD BUILD_PYTHON BUILD_MATLAB BUILD_CLIB export_name CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CXX_DEPENDS F77 FFLAGS ac_ct_F77 FLIBS OS_IS_DARWIN OS_IS_WIN SHARED_CTLIB mex_ext F77_EXT CXX_EXT OBJ_EXT EXE_EXT local_math_libs math_libs SO LDSHARED 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 local_inst ctversion homedir ct_libdir ct_incdir ct_incroot ct_bindir ct_datadir ct_demodir ct_templdir ct_mandir ct_tutdir ct_docdir ct_dir CANTERA_LIBDIR CANTERA_INCDIR CT_TOOLS_BIN CANTERA_BINDIR CANTERA_EXAMPLES_DIR CANTERA_DATADIR username ctroot build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os buildlib MAKE ARCHIVE SOEXT SHARED PIC LCXX_FLAGS LCXX_END_LIBS USERDIR INCL_USER_CODE KERNEL BUILD_CK LIB_DIR LAPACK_LIBRARY build_lapack BLAS_LIBRARY build_blas LOCAL_LIBS CT_SHARED_LIB BUILD_F90 PYTHON_CMD BUILD_PYTHON MATLAB_CMD BUILD_MATLAB BUILD_CLIB export_name CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CXX_DEPENDS F77 FFLAGS ac_ct_F77 FLIBS OS_IS_DARWIN OS_IS_WIN SHARED_CTLIB mex_ext F77_EXT CXX_EXT OBJ_EXT EXE_EXT local_math_libs math_libs SO LDSHARED LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -1724,12 +1724,52 @@ _ACEOF
|
|||
# Matlab Interface
|
||||
#
|
||||
BUILD_MATLAB=0
|
||||
#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
|
||||
# fi
|
||||
#fi
|
||||
if test "$BUILD_MATLAB_TOOLBOX" != "n"; then
|
||||
if test -z "$MATLAB_CMD"; then
|
||||
# Extract the first word of "matlab", so it can be a program name with args.
|
||||
set dummy matlab; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_path_MATLAB_CMD+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
case $MATLAB_CMD in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_MATLAB_CMD="$MATLAB_CMD" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_MATLAB_CMD="$as_dir/$ac_word$ac_exec_ext"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
test -z "$ac_cv_path_MATLAB_CMD" && ac_cv_path_MATLAB_CMD=""none""
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
MATLAB_CMD=$ac_cv_path_MATLAB_CMD
|
||||
|
||||
if test -n "$MATLAB_CMD"; then
|
||||
echo "$as_me:$LINENO: result: $MATLAB_CMD" >&5
|
||||
echo "${ECHO_T}$MATLAB_CMD" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
if test "$MATLAB_CMD" != "none"; then BUILD_MATLAB=1; BUILD_CLIB=1; fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -3103,7 +3143,7 @@ fi
|
|||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:3106:" \
|
||||
echo "$as_me:3146:" \
|
||||
"checking for Fortran 77 compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
|
|
@ -3280,7 +3320,7 @@ _ACEOF
|
|||
# flags.
|
||||
ac_save_FFLAGS=$FFLAGS
|
||||
FFLAGS="$FFLAGS $ac_verb"
|
||||
(eval echo $as_me:3283: \"$ac_link\") >&5
|
||||
(eval echo $as_me:3323: \"$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
|
||||
|
|
@ -3360,7 +3400,7 @@ _ACEOF
|
|||
# flags.
|
||||
ac_save_FFLAGS=$FFLAGS
|
||||
FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
|
||||
(eval echo $as_me:3363: \"$ac_link\") >&5
|
||||
(eval echo $as_me:3403: \"$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
|
||||
|
|
@ -4273,6 +4313,7 @@ s,@CT_SHARED_LIB@,$CT_SHARED_LIB,;t t
|
|||
s,@BUILD_F90@,$BUILD_F90,;t t
|
||||
s,@PYTHON_CMD@,$PYTHON_CMD,;t t
|
||||
s,@BUILD_PYTHON@,$BUILD_PYTHON,;t t
|
||||
s,@MATLAB_CMD@,$MATLAB_CMD,;t t
|
||||
s,@BUILD_MATLAB@,$BUILD_MATLAB,;t t
|
||||
s,@BUILD_CLIB@,$BUILD_CLIB,;t t
|
||||
s,@export_name@,$export_name,;t t
|
||||
|
|
|
|||
|
|
@ -343,13 +343,14 @@ AC_DEFINE_UNQUOTED(PYTHON_EXE,"$PYTHON_CMD")
|
|||
# Matlab Interface
|
||||
#
|
||||
BUILD_MATLAB=0
|
||||
#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
|
||||
# fi
|
||||
#fi
|
||||
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
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(BUILD_MATLAB)
|
||||
AC_SUBST(MATLAB_CMD)
|
||||
AC_SUBST(BUILD_CLIB)
|
||||
|
||||
#-------------------------------------------------
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue