diff --git a/Cantera/matlab/setup_matlab.py.in b/Cantera/matlab/setup_matlab.py.in index 2b04c4117..d00cc50e3 100644 --- a/Cantera/matlab/setup_matlab.py.in +++ b/Cantera/matlab/setup_matlab.py.in @@ -2,7 +2,7 @@ import sys bindir = '@ct_bindir@' -libdir = '-L@buildlib@ @LOCAL_LIB_DIRS@' + libdir = '-L@buildlib@ @LOCAL_LIB_DIRS@' incdir = '@buildinc@' libs = '-lclib @LOCAL_LIBS@ @LIBS@ @FLIBS@' diff --git a/config/configure b/config/configure index 478329d4e..f1c2e18bf 100755 --- a/config/configure +++ b/config/configure @@ -1354,7 +1354,7 @@ fi ctversion=${CANTERA_VERSION} cat >>confdefs.h <<_ACEOF -#define CANTERA_VERSION $ctversion +#define CANTERA_VERSION "$ctversion" _ACEOF @@ -1757,9 +1757,10 @@ if test x"$build_with_f2c" = "x1" ; then NEED_F2C=1 case $ac_sys_system in Linux) NEED_F2C= ;; - Darwin*) NEED_F2C= ;; esac fi +# Darwin*) NEED_F2C= ;; + # LOCAL_LIBS: @@ -1811,9 +1812,9 @@ then LOCAL_LIBS=$LOCAL_LIBS' '-lctf2c else case $ac_sys_system in Linux) LOCAL_LIBS=$LOCAL_LIBS' '-lg2c;; - Darwin*) LOCAL_LIBS=$LOCAL_LIBS' '-lg2c;; esac fi +# Darwin*) LOCAL_LIBS=$LOCAL_LIBS' '-lg2c;; if test -n "$NEED_CKREADER" then LOCAL_LIBS=$LOCAL_LIBS' '-lconverters @@ -3432,7 +3433,7 @@ fi # Provide some information about the compiler. -echo "$as_me:3435:" \ +echo "$as_me:3436:" \ "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 @@ -3609,7 +3610,7 @@ _ACEOF # flags. ac_save_FFLAGS=$FFLAGS FFLAGS="$FFLAGS $ac_verb" -(eval echo $as_me:3612: \"$ac_link\") >&5 +(eval echo $as_me:3613: \"$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 @@ -3689,7 +3690,7 @@ _ACEOF # flags. ac_save_FFLAGS=$FFLAGS FFLAGS="$FFLAGS $ac_cv_prog_f77_v" -(eval echo $as_me:3692: \"$ac_link\") >&5 +(eval echo $as_me:3693: \"$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/config/configure.in b/config/configure.in index 6b7383576..a07a6a334 100755 --- a/config/configure.in +++ b/config/configure.in @@ -109,7 +109,7 @@ AC_SUBST(python_win_prefix) ctversion=${CANTERA_VERSION} AC_SUBST(ctversion) -AC_DEFINE_UNQUOTED(CANTERA_VERSION,$ctversion) +AC_DEFINE_UNQUOTED(CANTERA_VERSION,"$ctversion") homedir=${HOME} AC_SUBST(homedir) @@ -399,9 +399,10 @@ if test x"$build_with_f2c" = "x1" ; then NEED_F2C=1 case $ac_sys_system in Linux) NEED_F2C= ;; - Darwin*) NEED_F2C= ;; esac fi +# Darwin*) NEED_F2C= ;; + AC_SUBST(build_with_f2c) # LOCAL_LIBS: @@ -453,9 +454,9 @@ then LOCAL_LIBS=$LOCAL_LIBS' '-lctf2c else case $ac_sys_system in Linux) LOCAL_LIBS=$LOCAL_LIBS' '-lg2c;; - Darwin*) LOCAL_LIBS=$LOCAL_LIBS' '-lg2c;; esac fi +# Darwin*) LOCAL_LIBS=$LOCAL_LIBS' '-lg2c;; if test -n "$NEED_CKREADER" then LOCAL_LIBS=$LOCAL_LIBS' '-lconverters diff --git a/ext/Makefile.in b/ext/Makefile.in index f3a0e397a..afb18e295 100755 --- a/ext/Makefile.in +++ b/ext/Makefile.in @@ -12,7 +12,7 @@ BUILD_BLAS=@build_blas@ BUILD_WITH_F2C=@build_with_f2c@ LIBS = blas/libctblas.a lapack/libctlapack.a math/libctmath.a \ - recipes/librecipes.a cvode/libcvode.a tpx/libtpx.a + cvode/libcvode.a tpx/libtpx.a all: (if test -d "f2c_libs" ; then \ @@ -29,7 +29,7 @@ ifeq ($(BUILD_BLAS),1) else cd f2c_blas; @MAKE@ clean endif - cd f2c_recipes; @MAKE@ +# cd f2c_recipes; @MAKE@ cd f2c_math; @MAKE@ else ifeq ($(BUILD_LAPACK),1) @@ -42,7 +42,7 @@ ifeq ($(BUILD_BLAS),1) else cd blas; @MAKE@ clean endif - cd recipes; @MAKE@ +# cd recipes; @MAKE@ cd math; @MAKE@ endif cd cvode; @MAKE@ @@ -51,7 +51,7 @@ endif clean: cd lapack; @MAKE@ clean cd blas; @MAKE@ clean - cd recipes; @MAKE@ clean +# cd recipes; @MAKE@ clean cd cvode; @MAKE@ clean cd math; @MAKE@ clean cd tpx; @MAKE@ clean @@ -67,9 +67,9 @@ clean: (if test -d "f2c_math" ; then \ cd f2c_math ; @MAKE@ clean ; \ fi) - (if test -d "f2c_recipes" ; then \ - cd f2c_recipes ; @MAKE@ clean ; \ - fi) +# (if test -d "f2c_recipes" ; then \ +# cd f2c_recipes ; @MAKE@ clean ; \ +# fi) depends: ifeq ($(BUILD_WITH_F2C),1) @@ -85,13 +85,13 @@ ifeq ($(BUILD_WITH_F2C),1) (if test -d "f2c_math" ; then \ cd f2c_math ; @MAKE@ depends ; \ fi) - (if test -d "f2c_recipes" ; then \ +# (if test -d "f2c_recipes" ; then \ cd f2c_recipes ; @MAKE@ depends ; \ fi) else cd lapack; @MAKE@ depends cd blas; @MAKE@ depends - cd recipes; @MAKE@ depends +# cd recipes; @MAKE@ depends cd math; @MAKE@ depends endif cd cvode; @MAKE@ depends