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

Several changes:

Browse source 
CYGWIN is now undefined, not just 0
   WINMSVC is now undefined, not just 0

   OS_IS_CYGWIN is now 0 when OS_IS_WIN = 1
This commit is contained in:
Harry Moffat 2004-08-10 17:28:12 +00:00
parent 4b0cdf228a
commit bd33a52835
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
config/configure.in
View file

@ -33,10 +33,11 @@ esac
CVF_LIBDIR=""
if test "x${OS_IS_CYGWIN}" = "x1"; then
if test "${USE_VISUAL_STUDIO}" = "y"; then
OS_IS_WIN=1;
CVF_LIBDIR=$FORTRAN_LIB_DIR
fi
if test "${USE_VISUAL_STUDIO}" = "y"; then
OS_IS_WIN=1;
OS_IS_CYGWIN=0;
CVF_LIBDIR=$FORTRAN_LIB_DIR
fi
fi
AC_SUBST(CVF_LIBDIR)
@ -46,7 +47,7 @@ if test "x$OS_IS_DARWIN" = "x1"; then prdef="/Applications/Cantera"; fi
local_inst=1
if test "x${prefix}" = "xNONE"; then
if test "x${OS_IS_CYGWIN}" = "x1"; then
if test "x${OS_IS_CYGWIN}" = "x1" -o "x${OS_IS_WIN}" = "x1" ; then
prefix=${CANTERA_INSTALL_DIR}
# mkdir ${prefix}
else
@ -71,7 +72,6 @@ if test "x${OS_IS_WIN}" = "x1"; then
fi
echo "Cantera will be installed in ${prefix}"
AC_SUBST(prefix)
AC_SUBST(local_inst)
@ -201,8 +201,12 @@ AC_SUBST(buildbin)
# add definitions to config.h
AC_DEFINE_UNQUOTED(DARWIN,$OS_IS_DARWIN)
AC_DEFINE_UNQUOTED(CYGWIN,$OS_IS_CYGWIN)
AC_DEFINE_UNQUOTED(WINMSVC,$OS_IS_WIN)
if test "x${OS_IS_CYGWIN}" = "x1"; then
AC_DEFINE_UNQUOTED(CYGWIN,$OS_IS_CYGWIN)
fi
if test "x${OS_IS_WIN}" = "x1"; then
AC_DEFINE_UNQUOTED(WINMSVC,$OS_IS_WIN)
fi
AC_DEFINE_UNQUOTED(RXNPATH_FONT,"$RPFONT")
#AC_DEFINE_UNQUOTED(CANTERA_ROOT,"$prefix/cantera")
AC_DEFINE_UNQUOTED(CANTERA_DATA,"$ct_datadir")
@ -509,8 +513,10 @@ if test $BUILD_PYTHON -gt 0; then
fi
else
echo "Python command preset to $PYTHON_CMD"
WIN_PYTHON_CMD=`cygpath -a -m "$PYTHON_CMD"`
echo "Windows Python Command set to $WIN_PYTHON_CMD"
if test "x$OS_IS_WIN" = "x1"; then
WIN_PYTHON_CMD=`cygpath -a -m "$PYTHON_CMD"`
echo "Windows Python Command set to $WIN_PYTHON_CMD"
fi
fi
if test "$PYTHON_CMD" = "none"; then