Mercurial > hg > octave-jordi
changeset 19348:043440fa7006 stable
configure.ac: Respect without-z and without-qrupdate options when config.cache exists.
* configure.ac: Check that Z lib and QRUPDATE lib are desired, rather than
the previous result in cache variable, to determine if AC_DEFINE should
execute.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sun, 23 Nov 2014 15:15:02 -0800 |
| parents | 2da8f0c6e8a3 |
| children | 98c7fa559d75 c6437824681c |
| files | configure.ac |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac +++ b/configure.ac @@ -784,7 +784,7 @@ [zlib.h], [gzclearerr]) ### Also define HAVE_ZLIB if libz is found. -if test $octave_cv_lib_z = yes; then +if test -z "$warn_z"; then AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if ZLIB is available.]) fi @@ -1428,7 +1428,8 @@ [sqr1up], [Fortran 77], [don't use qrupdate, disable QR & Cholesky updating functions]) -if test $octave_cv_lib_qrupdate = yes; then +## Additional check to see if qrupdate lib found supports LU updates +if test -z "$warn_qrupdate"; then AC_CACHE_CHECK([for slup1up in $QRUPDATE_LIBS], [octave_cv_func_slup1up], [LIBS="$LIBS $QRUPDATE_LIBS"