Mercurial > octave
diff build-aux/subst-config-vals.in.sh @ 23990:6f56efc098bd
check for suitesparse config library before other suitesparse libraries
* configure.ac: Move check for suitesparse config library ahead of
checks for other SuiteSparse libraries. Use OCTAVE_CHECK_LIB to allow
it to be disabled and to specify a location for it. Use
SUITESPARSECONFIG_LIBS instead of SUITESPARSE_CONFIG_LIBS.
Change all uses and variable names to match in build config files.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 01 Sep 2017 11:15:55 -0400 |
| parents | bba752b37f8e |
| children | 194eb4bd202b |
line wrap: on
line diff
--- a/build-aux/subst-config-vals.in.sh Fri Sep 01 07:20:01 2017 -0400 +++ b/build-aux/subst-config-vals.in.sh Fri Sep 01 11:15:55 2017 -0400 @@ -153,7 +153,7 @@ SH_LD="@SH_LD@" SH_LDFLAGS="@SH_LDFLAGS@" STATIC_LIBS="@STATIC_LIBS@" -SUITESPARSE_CONFIG_LIBS="@SUITESPARSE_CONFIG_LIBS@" +SUITESPARSECONFIG_LIBS="@SUITESPARSECONFIG_LIBS@" SUNDIALS_IDA_CPPFLAGS="@SUNDIALS_IDA_CPPFLAGS@" SUNDIALS_IDA_LDFLAGS="@SUNDIALS_IDA_LDFLAGS@" SUNDIALS_IDA_LIBS="@SUNDIALS_IDA_LIBS@" @@ -330,7 +330,7 @@ -e "s|%OCTAVE_CONF_SH_LD%|\"${SH_LD}\"|" \ -e "s|%OCTAVE_CONF_SH_LDFLAGS%|\"${SH_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_STATIC_LIBS%|\"${STATIC_LIBS}\"|" \ - -e "s|%OCTAVE_CONF_SUITESPARSE_CONFIG_LIBS%|\"${SUITESPARSE_CONFIG_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_SUITESPARSECONFIG_LIBS%|\"${SUITESPARSECONFIG_LIBS}\"|" \ -e "s|%OCTAVE_CONF_SUNDIALS_IDA_CPPFLAGS%|\"${SUNDIALS_IDA_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_SUNDIALS_IDA_LDFLAGS%|\"${SUNDIALS_IDA_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_SUNDIALS_IDA_LIBS%|\"${SUNDIALS_IDA_LIBS}\"|" \