fixed sundials test
This commit is contained in:
Dave Goodwin
parent
70d277c86e
commit
87961902de
2 changed files with 25 additions and 24 deletions
32
config/configure
vendored
32
config/configure
vendored
|
|
@ -1584,16 +1584,9 @@ use_sundials=0
|
|||
sundials_inc=
|
||||
CVODE_LIBS='-lcvode'
|
||||
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
if test "x$USE_SUNDIALS" = "xy"; then
|
||||
ldsave=$LDFLAGS
|
||||
LDFLAGS='-L'${SUNDIALS_HOME}/lib' '$ldsave
|
||||
LDFLAGS='-L'$SUNDIALS_HOME/lib' '$ldsave
|
||||
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
|
|
@ -2469,7 +2462,8 @@ if test "${ac_cv_lib_sundials_cvodes_CVodeCreate+set}" = set; then
|
|||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lsundials_cvodes -lsundials_shared -lsundials_nvecserial $LIBS"
|
||||
LIBS="-lsundials_cvodes \
|
||||
-lsundials_shared -lsundials_nvecserial -lm $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
|
|
@ -2518,12 +2512,15 @@ fi
|
|||
echo "$as_me:$LINENO: result: $ac_cv_lib_sundials_cvodes_CVodeCreate" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_sundials_cvodes_CVodeCreate" >&6
|
||||
if test $ac_cv_lib_sundials_cvodes_CVodeCreate = yes; then
|
||||
use_sundials=1;
|
||||
use_sundials=1
|
||||
else
|
||||
use_sundials=0;
|
||||
use_sundials=0
|
||||
fi
|
||||
|
||||
|
||||
LDFLAGS=$ldsave
|
||||
|
||||
if test "x$USE_SUNDIALS" = "xy"; then
|
||||
if test use_sundials=1; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAS_SUNDIALS 1
|
||||
|
|
@ -4205,7 +4202,7 @@ fi
|
|||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:4208:" \
|
||||
echo "$as_me:4205:" \
|
||||
"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
|
||||
|
|
@ -4382,7 +4379,7 @@ _ACEOF
|
|||
# flags.
|
||||
ac_save_FFLAGS=$FFLAGS
|
||||
FFLAGS="$FFLAGS $ac_verb"
|
||||
(eval echo $as_me:4385: \"$ac_link\") >&5
|
||||
(eval echo $as_me:4382: \"$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
|
||||
|
|
@ -4462,7 +4459,7 @@ _ACEOF
|
|||
# flags.
|
||||
ac_save_FFLAGS=$FFLAGS
|
||||
FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
|
||||
(eval echo $as_me:4465: \"$ac_link\") >&5
|
||||
(eval echo $as_me:4462: \"$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
|
||||
|
|
@ -4762,7 +4759,7 @@ EOF
|
|||
f90opts="-p. -p${ct_incdir} -s -YEXT_NAMES=LCS -YEXT_SFX=_ -YCFRL=1"
|
||||
f90buildopts="-p. -s -YEXT_NAMES=LCS -YEXT_SFX=_ -YCFRL=1"
|
||||
fi
|
||||
rm -f testf90.f90 f90out
|
||||
rm -f testf90.f90
|
||||
echo "$as_me:$LINENO: result: ${f90type}" >&5
|
||||
echo "${ECHO_T}${f90type}" >&6
|
||||
if test -n $BUILD_F90; then
|
||||
|
|
@ -4785,6 +4782,7 @@ F90BUILDFLAGS=${f90buildopts}' '${savef90flags}
|
|||
|
||||
|
||||
|
||||
echo "objext = " $OBJEXT
|
||||
|
||||
|
||||
|
||||
|
|
@ -4810,7 +4808,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
|||
if test -z "$CXX_EXT"; then CXX_EXT=cpp; fi
|
||||
|
||||
|
||||
if test -z "$OBJ_EXT"; then OBJ_EXT=$OBJEXT; fi
|
||||
if test -z "$OBJ_EXT"; then OBJ_EXT='o'; fi
|
||||
|
||||
|
||||
if test -z "$EXE_EXT"; then EXE_EXT=$EXEEXT; fi
|
||||
|
|
|
|||
|
|
@ -241,13 +241,15 @@ use_sundials=0
|
|||
sundials_inc=
|
||||
CVODE_LIBS='-lcvode'
|
||||
|
||||
AC_LANG_C
|
||||
ldsave=$LDFLAGS
|
||||
LDFLAGS='-L'$SUNDIALS_HOME/lib' '$ldsave
|
||||
|
||||
AC_CHECK_LIB(sundials_cvodes, CVodeCreate, [use_sundials=1], [use_sundials=0],\
|
||||
[-lsundials_shared -lsundials_nvecserial -lm])
|
||||
|
||||
LDFLAGS=$ldsave
|
||||
|
||||
if test "x$USE_SUNDIALS" = "xy"; then
|
||||
ldsave=$LDFLAGS
|
||||
LDFLAGS='-L'${SUNDIALS_HOME}/lib' '$ldsave
|
||||
AC_CHECK_LIB(sundials_cvodes, CVodeCreate, [use_sundials=1;], [use_sundials=0;],[-lsundials_shared -lsundials_nvecserial])
|
||||
LDFLAGS=$ldsave
|
||||
if test use_sundials=1; then
|
||||
AC_DEFINE(HAS_SUNDIALS)
|
||||
CVODE_LIBS='-lsundials_cvodes -lsundials_shared -lsundials_nvecserial'
|
||||
|
|
@ -756,7 +758,7 @@ EOF
|
|||
f90opts="-p. -p${ct_incdir} -s -YEXT_NAMES=LCS -YEXT_SFX=_ -YCFRL=1"
|
||||
f90buildopts="-p. -s -YEXT_NAMES=LCS -YEXT_SFX=_ -YCFRL=1"
|
||||
fi
|
||||
rm -f testf90.f90 f90out
|
||||
rm -f testf90.f90
|
||||
AC_MSG_RESULT(${f90type})
|
||||
if test -n $BUILD_F90; then
|
||||
if test "x${has_f90}" = "xno"; then
|
||||
|
|
@ -778,6 +780,7 @@ AC_SUBST(F90BUILDFLAGS)
|
|||
AC_OBJEXT
|
||||
AC_EXEEXT
|
||||
|
||||
echo "objext = " $OBJEXT
|
||||
|
||||
AC_SUBST(precompile_headers)
|
||||
AC_SUBST(CXX_DEPENDS)
|
||||
|
|
@ -798,7 +801,7 @@ AC_LANG_CPLUSPLUS
|
|||
if test -z "$CXX_EXT"; then CXX_EXT=cpp; fi
|
||||
AC_SUBST(CXX_EXT)
|
||||
|
||||
if test -z "$OBJ_EXT"; then OBJ_EXT=$OBJEXT; fi
|
||||
if test -z "$OBJ_EXT"; then OBJ_EXT='o'; fi
|
||||
AC_SUBST(OBJ_EXT)
|
||||
|
||||
if test -z "$EXE_EXT"; then EXE_EXT=$EXEEXT; fi
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue