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

During an out-of-the-box preconfig run, the user will unwillingly ask for

Browse source 
a FULL python installation, but will inevitably fail because neither the numarray
or numeric package has been installed.
Now, a check is made during the raw preconfig run to see if the include
files for the numarray package can be found. If they can't be found and the
python installation option is set to default, then the python build variable
is set to 1, reducing python to a minimal installation.

In most cases, the raw out-of-the-box
  preconfig
  make
  make test

steps will now work. Whereas before, there were compile errors occurring because
the numarray include files were not able to be found.

More information about the SUNDIALS installation is now printed out.

CVS
This commit is contained in:
Harry Moffat 2007-07-24 17:37:05 +00:00
parent f7cc4b6075
commit a82de03550
2 changed files with 4515 additions and 3797 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8271
configure vendored
View file

File diff suppressed because it is too large Load diff

41
configure.in
View file

@ -181,7 +181,7 @@ ctversion=${CANTERA_VERSION}
AC_SUBST(ctversion)
AC_DEFINE_UNQUOTED(CANTERA_VERSION,"$ctversion")
homedir=${HOME}
homedir="${HOME}"
AC_SUBST(homedir)
@ -326,18 +326,32 @@ if test "x$SUNDIALS_HOME" = "x"; then
SUNDIALS_LIB_DIR=/usr/local/lib
SUNDIALS_INC_DIR=/usr/local/include
else
SUNDIALS_LIB_DIR=$SUNDIALS_HOME/lib
SUNDIALS_INC_DIR=$SUNDIALS_HOME/include
SUNDIALS_LIB_DIR="$SUNDIALS_HOME/lib"
SUNDIALS_INC_DIR="$SUNDIALS_HOME/include"
fi
if test "$USE_SUNDIALS" = "default"; then
ldsave=$LDFLAGS
LDFLAGS='-L'$SUNDIALS_LIB_DIR' '$ldsave
#
# HKM Disabled this line as it was causing configure to fail when
# SUNDIALS_LIB_DIR had a space in it, despite use of double quotes everywhere
#ldsave="$LDFLAGS"
#LDFLAGS='-L'"$SUNDIALS_LIB_DIR"' '"$ldsave"
AC_CHECK_LIB(sundials_cvodes, CVodeCreate, [use_sundials=1], [use_sundials=0],\
[-lsundials_cvodes -lsundials_nvecserial -lm])
LDFLAGS=$ldsave
if test ${use_sundials} = 0 ; then
tmpFile="$SUNDIALS_LIB_DIR/libsundials_cvodes.a"
if test -f $tmpFile ; then
use_sundials=1
fi
fi
if test ${use_sundials} = 1 ; then
echo SUNDIALS: succeeded in finding a sundials installation
else
echo SUNDIALS: failed at finding a sundials installation
fi
#LDFLAGS=$ldsave
fi
if test "x$USE_SUNDIALS" = "xy"; then
@ -867,6 +881,19 @@ else
echo "setting NUMARRAY_INC_DIR to $NUMARRAY_INC_DIR"
fi
fi
if test $BUILD_PYTHON = 2 ; then
if test x"$NUMARRAY_INC_DIR" = "x" ; then
if test ! "$USE_NUMERIC" = "y"; then
echo 'NUMARRAY is being used but we can find it'
if test "x$PYTHON_PACKAGE" = "xdefault"; then
echo 'setting python package build back to minimal'
BUILD_PYTHON=1
fi
fi
fi
fi
AC_SUBST(NUMARRAY_INC_DIR)
AC_SUBST(NUMARRAY_HOME)
AC_SUBST(CANTERA_PYTHON_HOME)