From 3b529d293a9ed3f8f46b9ba7f362e112e3fea16f Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Thu, 17 Aug 2006 16:24:58 +0000 Subject: [PATCH] Added lines to remove a temporary file f90out --- configure | 9 ++++++--- configure.in | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configure b/configure index f9f6ba0ce..e9f90898b 100755 --- a/configure +++ b/configure @@ -9139,13 +9139,16 @@ EOF rm -f testf90.f90 echo "$as_me:$LINENO: result: ${f90type}" >&5 echo "${ECHO_T}${f90type}" >&6 - if test -n $BUILD_F90; then + if test "x${BUILD_F90}" != "x0"; then if test "x${has_f90}" = "xno"; then echo " -> cannot build the Fortran 90 interface" BUILD_F90=0 fi fi fi +if test -e f90out ; then + rm -f f90out +fi savef90flags=${F90FLAGS} F90FLAGS=${f90opts}' '${F90FLAGS} F90BUILDFLAGS=${f90buildopts}' '${savef90flags} @@ -9299,7 +9302,7 @@ esac - ac_config_files="$ac_config_files Makefile Cantera/Makefile Cantera/src/Makefile Cantera/src/zeroD/Makefile Cantera/src/oneD/Makefile Cantera/src/converters/Makefile Cantera/src/transport/Makefile Cantera/src/thermo/Makefile Cantera/clib/src/Makefile Cantera/fortran/src/Makefile Cantera/fortran/f77demos/f77demos.mak Cantera/fortran/f77demos/isentropic.dsp Cantera/matlab/Makefile Cantera/matlab/setup_matlab.py Cantera/matlab/setup_winmatlab.py Cantera/python/Makefile Cantera/python/setup.py Cantera/cxx/Makefile Cantera/cxx/src/Makefile Cantera/cxx/demos/Makefile Cantera/user/Makefile Cantera/python/src/Makefile ext/lapack/Makefile ext/blas/Makefile ext/cvode/Makefile ext/math/Makefile ext/tpx/Makefile ext/Makefile ext/f2c_libs/Makefile ext/f2c_blas/Makefile ext/f2c_lapack/Makefile ext/f2c_math/Makefile ext/recipes/Makefile examples/Makefile examples/cxx/Makefile tools/Makefile tools/doc/Cantera.cfg tools/doc/Makefile tools/src/Makefile tools/src/sample.mak tools/src/finish_install.py tools/src/package4mac tools/templates/f77/demo.mak tools/templates/f90/demo.mak tools/templates/cxx/demo.mak tools/testtools/Makefile data/inputs/Makefile test_problems/Makefile test_problems/cxx_ex/Makefile test_problems/silane_equil/Makefile test_problems/surfkin/Makefile test_problems/diamondSurf/Makefile test_problems/fracCoeff/Makefile test_problems/negATest/Makefile test_problems/ck2cti_test/Makefile test_problems/ck2cti_test/runtest test_problems/min_python/Makefile test_problems/min_python/minDiamond/Makefile test_problems/min_python/negATest/Makefile test_problems/python/Makefile test_problems/cathermo/Makefile test_problems/cathermo/issp/Makefile test_problems/cathermo/ims/Makefile test_problems/cathermo/testIAPWS/Makefile test_problems/cathermo/testIAPWSPres/Makefile test_problems/cathermo/testIAPWSTripP/Makefile test_problems/cathermo/testWaterPDSS/Makefile test_problems/cathermo/testWaterTP/Makefile test_problems/cathermo/HMW_test_1/Makefile test_problems/cathermo/HMW_test_3/Makefile test_problems/cathermo/HMW_graph_GvT/Makefile test_problems/cathermo/HMW_graph_GvI/Makefile test_problems/cathermo/HMW_graph_HvT/Makefile test_problems/cathermo/HMW_graph_CpvT/Makefile test_problems/cathermo/HMW_graph_VvT/Makefile test_problems/cathermo/DH_graph_1/Makefile bin/install_tsc" + ac_config_files="$ac_config_files Makefile Cantera/Makefile Cantera/src/Makefile Cantera/src/zeroD/Makefile Cantera/src/oneD/Makefile Cantera/src/converters/Makefile Cantera/src/transport/Makefile Cantera/src/thermo/Makefile Cantera/clib/src/Makefile Cantera/fortran/src/Makefile Cantera/fortran/f77demos/f77demos.mak Cantera/fortran/f77demos/isentropic.dsp Cantera/matlab/Makefile Cantera/matlab/setup_matlab.py Cantera/matlab/setup_winmatlab.py Cantera/python/Makefile Cantera/python/setup.py Cantera/cxx/Makefile Cantera/cxx/src/Makefile Cantera/cxx/demos/Makefile Cantera/user/Makefile Cantera/python/src/Makefile ext/lapack/Makefile ext/blas/Makefile ext/cvode/Makefile ext/math/Makefile ext/recipes/Makefile ext/tpx/Makefile ext/Makefile ext/f2c_libs/Makefile ext/f2c_blas/Makefile ext/f2c_lapack/Makefile ext/f2c_math/Makefile examples/Makefile examples/cxx/Makefile tools/Makefile tools/doc/Cantera.cfg tools/doc/Makefile tools/src/Makefile tools/src/sample.mak tools/src/finish_install.py tools/src/package4mac tools/templates/f77/demo.mak tools/templates/f90/demo.mak tools/templates/cxx/demo.mak tools/testtools/Makefile data/inputs/Makefile test_problems/Makefile test_problems/cxx_ex/Makefile test_problems/silane_equil/Makefile test_problems/surfkin/Makefile test_problems/diamondSurf/Makefile test_problems/fracCoeff/Makefile test_problems/negATest/Makefile test_problems/ck2cti_test/Makefile test_problems/ck2cti_test/runtest test_problems/min_python/Makefile test_problems/min_python/minDiamond/Makefile test_problems/min_python/negATest/Makefile test_problems/python/Makefile test_problems/cathermo/Makefile test_problems/cathermo/issp/Makefile test_problems/cathermo/ims/Makefile test_problems/cathermo/testIAPWS/Makefile test_problems/cathermo/testIAPWSPres/Makefile test_problems/cathermo/testIAPWSTripP/Makefile test_problems/cathermo/testWaterPDSS/Makefile test_problems/cathermo/testWaterTP/Makefile test_problems/cathermo/HMW_test_1/Makefile test_problems/cathermo/HMW_test_3/Makefile test_problems/cathermo/HMW_graph_GvT/Makefile test_problems/cathermo/HMW_graph_GvI/Makefile test_problems/cathermo/HMW_graph_HvT/Makefile test_problems/cathermo/HMW_graph_CpvT/Makefile test_problems/cathermo/HMW_graph_VvT/Makefile test_problems/cathermo/DH_graph_1/Makefile bin/install_tsc" test "x$prefix" = xNONE && prefix=$ac_default_prefix @@ -9798,13 +9801,13 @@ do "ext/blas/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/blas/Makefile" ;; "ext/cvode/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/cvode/Makefile" ;; "ext/math/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/math/Makefile" ;; + "ext/recipes/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/recipes/Makefile" ;; "ext/tpx/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/tpx/Makefile" ;; "ext/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/Makefile" ;; "ext/f2c_libs/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/f2c_libs/Makefile" ;; "ext/f2c_blas/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/f2c_blas/Makefile" ;; "ext/f2c_lapack/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/f2c_lapack/Makefile" ;; "ext/f2c_math/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/f2c_math/Makefile" ;; - "ext/recipes/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/recipes/Makefile" ;; "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; "examples/cxx/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/cxx/Makefile" ;; "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; diff --git a/configure.in b/configure.in index 0c760fe9d..ffb4adb92 100755 --- a/configure.in +++ b/configure.in @@ -1067,6 +1067,9 @@ EOF fi fi fi +if test -e f90out ; then + rm -f f90out +fi savef90flags=${F90FLAGS} F90FLAGS=${f90opts}' '${F90FLAGS} F90BUILDFLAGS=${f90buildopts}' '${savef90flags}