Mercurial > octave

comparison configure.ac @ 23981:6420142ff32c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure: fix capitalization of SUNDIALS, reword related terms * configure.ac: Fix capitalization of SUNDIALS. Refer to NVECTOR library rather than nvecserial. Delete unnecessary duplicate definition of HAVE_SUNDIALS_NVECSERIAL. * m4/acinclude.m4 (OCTAVE_CHECK_SUNDIALS_IDAKLU, OCTAVE_CHECK_SUNDIALS_SIZEOF_REALTYPE): Fix capitalization of SUNDIALS.
author Mike Miller <mtmiller@octave.org>
date Thu, 31 Aug 2017 14:00:39 -0700
parents eb6602171d59
children 3a07616e660b
comparison
equal deleted inserted replaced
23980:eb6602171d59 23981:6420142ff32c
2189 CPPFLAGS="$save_CPPFLAGS" 2189 CPPFLAGS="$save_CPPFLAGS"
2190 LDFLAGS="$save_LDFLAGS" 2190 LDFLAGS="$save_LDFLAGS"
2191 LIBS="$save_LIBS" 2191 LIBS="$save_LIBS"
2192 fi 2192 fi
2193 2193
2194 ### Check for Sundials nvecserial library and header. 2194 ### Check for SUNDIALS NVECTOR serial library and header.
2195 2195
2196 OCTAVE_CHECK_LIB(sundials_nvecserial, [Sundials nvecserial], 2196 OCTAVE_CHECK_LIB(sundials_nvecserial, [SUNDIALS NVECTOR],
2197 [Sundials nvecserial library not found. Solvers ode15i and ode15s will be disabled.], 2197 [SUNDIALS NVECTOR serial library not found. Solvers ode15i and ode15s will be disabled.],
2198 [nvector/nvector_serial.h nvector_serial.h ], [N_VNew_Serial], 2198 [nvector/nvector_serial.h nvector_serial.h ], [N_VNew_Serial],
2199 [], [don't use Sundials nvecserial library, solvers ode15i and ode15s will be disabled]) 2199 [], [don't use SUNDIALS NVECTOR library, solvers ode15i and ode15s will be disabled])
2200 2200
2201 if test -n "$SUNDIALS_NVECSERIAL_LIBS"; then 2201 ### Check for SUNDIALS IDA library and header.
2202 AC_DEFINE(HAVE_SUNDIALS_NVECSERIAL, 1,
2203 [Define to 1 if Sundials nvecserial is available.])
2204 fi
2205
2206 ### Check for Sundials IDA library and header.
2207 2202
2208 save_LIBS="$LIBS" 2203 save_LIBS="$LIBS"
2209 LIBS="$SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS $BLAS_LIBS $FLIBS $LIBS" 2204 LIBS="$SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS $BLAS_LIBS $FLIBS $LIBS"
2210 OCTAVE_CHECK_LIB(sundials_ida, [Sundials IDA], 2205 OCTAVE_CHECK_LIB(sundials_ida, [SUNDIALS IDA],
2211 [Sundials IDA library not found. Solvers ode15i and ode15s will be disabled.], 2206 [SUNDIALS IDA library not found. Solvers ode15i and ode15s will be disabled.],
2212 [ida/ida.h ida.h], [IDAInit], 2207 [ida/ida.h ida.h], [IDAInit],
2213 [], [don't use Sundials IDA library, solvers ode15i and ode15s will be disabled], 2208 [], [don't use SUNDIALS IDA library, solvers ode15i and ode15s will be disabled],
2214 [warn_sundials_ida= 2209 [warn_sundials_ida=
2215 OCTAVE_CHECK_SUNDIALS_SIZEOF_REALTYPE 2210 OCTAVE_CHECK_SUNDIALS_SIZEOF_REALTYPE
2216 OCTAVE_CHECK_SUNDIALS_IDAKLU]) 2211 OCTAVE_CHECK_SUNDIALS_IDAKLU])
2217 LIBS="$save_LIBS" 2212 LIBS="$save_LIBS"
2218 2213
2219 ## Define this way instead of with an #if in oct-conf-post.h so that 2214 ## Define this way instead of with an #if in oct-conf-post.h so that
2220 ## the build features script will get the correct value. 2215 ## the build features script will get the correct value.
2221 if test -n "$SUNDIALS_IDA_LIBS" \ 2216 if test -n "$SUNDIALS_IDA_LIBS" \
2222 && test -n "$SUNDIALS_NVECSERIAL_LIBS" \ 2217 && test -n "$SUNDIALS_NVECSERIAL_LIBS" \
2223 && test $octave_cv_sundials_realtype_is_double = yes; then 2218 && test $octave_cv_sundials_realtype_is_double = yes; then
2224 AC_DEFINE(HAVE_SUNDIALS, 1, [Define Sundials is available.]) 2219 AC_DEFINE(HAVE_SUNDIALS, 1, [Define to 1 if SUNDIALS is available.])
2225 fi 2220 fi
2226 2221
2227 ## Collections of flags. These are here instead of just in the 2222 ## Collections of flags. These are here instead of just in the
2228 ## Makefile.am file because we substitute some of them into other 2223 ## Makefile.am file because we substitute some of them into other
2229 ## source files like mkoctfile. 2224 ## source files like mkoctfile.
3290 READLINE libraries: $READLINE_LIBS 3285 READLINE libraries: $READLINE_LIBS
3291 Sndfile CPPFLAGS: $SNDFILE_CPPFLAGS 3286 Sndfile CPPFLAGS: $SNDFILE_CPPFLAGS
3292 Sndfile LDFLAGS: $SNDFILE_LDFLAGS 3287 Sndfile LDFLAGS: $SNDFILE_LDFLAGS
3293 Sndfile libraries: $SNDFILE_LIBS 3288 Sndfile libraries: $SNDFILE_LIBS
3294 SuiteSparse config libraries: $SUITESPARSE_CONFIG_LIBS 3289 SuiteSparse config libraries: $SUITESPARSE_CONFIG_LIBS
3295 SUNDIALS_IDA CPPFLAGS: $SUNDIALS_IDA_CPPFLAGS 3290 SUNDIALS IDA CPPFLAGS: $SUNDIALS_IDA_CPPFLAGS
3296 SUNDIALS_IDA LDFLAGS: $SUNDIALS_IDA_LDFLAGS 3291 SUNDIALS IDA LDFLAGS: $SUNDIALS_IDA_LDFLAGS
3297 SUNDIALS_IDA libraries: $SUNDIALS_IDA_LIBS 3292 SUNDIALS IDA libraries: $SUNDIALS_IDA_LIBS
3298 SUNDIALS_NVECSERIAL CPPFLAGS: $SUNDIALS_NVECSERIAL_CPPFLAGS 3293 SUNDIALS NVECTOR CPPFLAGS: $SUNDIALS_NVECSERIAL_CPPFLAGS
3299 SUNDIALS_NVECSERIAL LDFLAGS: $SUNDIALS_NVECSERIAL_LDFLAGS 3294 SUNDIALS NVECTOR LDFLAGS: $SUNDIALS_NVECSERIAL_LDFLAGS
3300 SUNDIALS_NVECSERIAL libraries: $SUNDIALS_NVECSERIAL_LIBS 3295 SUNDIALS NVECTOR libraries: $SUNDIALS_NVECSERIAL_LIBS
3301 TERM libraries: $TERM_LIBS 3296 TERM libraries: $TERM_LIBS
3302 UMFPACK CPPFLAGS: $UMFPACK_CPPFLAGS 3297 UMFPACK CPPFLAGS: $UMFPACK_CPPFLAGS
3303 UMFPACK LDFLAGS: $UMFPACK_LDFLAGS 3298 UMFPACK LDFLAGS: $UMFPACK_LDFLAGS
3304 UMFPACK libraries: $UMFPACK_LIBS 3299 UMFPACK libraries: $UMFPACK_LIBS
3305 X11 include flags: $X11_INCFLAGS 3300 X11 include flags: $X11_INCFLAGS