research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed the output from configure. It had erroneous errors when

Browse source 
the matlab interface option was turned on.
This commit is contained in:
Harry Moffat 2007-08-30 21:37:28 +00:00
parent 1f03f24b92
commit 5676a9632c
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure vendored
View file

@ -3137,7 +3137,7 @@ fi
if test "$MATLAB_CMD" != "none" -a "x$MATLAB_CMD" != "x"; then
BUILD_MATLAB=1
BUILD_CLIB=1
echo 'HKM -> BUILD turned on 1'
#echo 'HKM -> BUILD turned on 1'
fi
else
echo "Matlab command preset to $MATLAB_CMD"
@ -3158,15 +3158,16 @@ try, mexext, catch, disp 'mex_unknown', end;
diary off;
exit;
EOF
echo 'HKM matlab = ' $MATLAB_CMD "\n"
${MATLAB_CMD} -nojvm -nosplash -r testmat &> /dev/null
# &> /dev/null`
if test -f diary; then
BUILD_MATLAB=1
echo $MATLAB_CMD
mex_ext=`grep mex* diary`
rm -f diary
else
BUILD_MATLAB=0
echo 'failed!'
fi
rm -f testmat.m
else
@ -3193,7 +3194,7 @@ if test "$BUILD_MATLAB" = "1"; then
echo "---------------------------- MATLAB -------------------------------"
echo "MEX file extension: " $mex_ext
echo "MATLAB command: " $MATLAB_CMD
ECHO "--------------------------------------------------------------------"
echo "--------------------------------------------------------------------"
echo " "
fi
@ -8450,7 +8451,7 @@ fi
# Provide some information about the compiler.
echo "$as_me:8453:" \
echo "$as_me:8454:" \
"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

7
configure.in
View file

@ -934,7 +934,7 @@ if test "$BUILD_MATLAB_TOOLBOX" != "n"; then
if test "$MATLAB_CMD" != "none" -a "x$MATLAB_CMD" != "x"; then
BUILD_MATLAB=1
BUILD_CLIB=1
echo 'HKM -> BUILD turned on 1'
#echo 'HKM -> BUILD turned on 1'
fi
else
echo "Matlab command preset to $MATLAB_CMD"
@ -954,15 +954,16 @@ try, mexext, catch, disp 'mex_unknown', end;
diary off;
exit;
EOF
echo 'HKM matlab = ' $MATLAB_CMD "\n"
${MATLAB_CMD} -nojvm -nosplash -r testmat &> /dev/null
# &> /dev/null`
if test -f diary; then
BUILD_MATLAB=1
echo $MATLAB_CMD
mex_ext=`grep mex* diary`
rm -f diary
else
BUILD_MATLAB=0
echo 'failed!'
fi
rm -f testmat.m
else
@ -989,7 +990,7 @@ if test "$BUILD_MATLAB" = "1"; then
echo "---------------------------- MATLAB -------------------------------"
echo "MEX file extension: " $mex_ext
echo "MATLAB command: " $MATLAB_CMD
ECHO "--------------------------------------------------------------------"
echo "--------------------------------------------------------------------"
echo " "
fi