Mercurial > hg > octave-nkf

changeset 19545:98c7fa559d75 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of stable to gui-release.
author Rik <rik@octave.org>
date Sun, 23 Nov 2014 16:22:40 -0800
parents c364b9a44580 (current diff) 043440fa7006 (diff)
children 2d8728156ba4
files configure.ac
diffstat 2 files changed, 4 insertions(+), 3 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"
--- a/scripts/plot/draw/private/__patch__.m
+++ b/scripts/plot/draw/private/__patch__.m
@@ -49,7 +49,7 @@
       else
         args{6} = [];
       endif
-      args = [args; varargin(2:end)];
+      args = [args, varargin(2:end)];
       args = setdata (args);
     else
       failed = true;