# HG changeset patch
# User Rik <rik@octave.org>
# Date 1416788560 28800
# Node ID 98c7fa559d75b60ee04c4278fe799303a1d10779
# Parent  c364b9a44580e2014a4c2b11bab97d8b46ef7f09# Parent  043440fa7006a635f79388624356bef104578684
maint: Periodic merge of stable to gui-release.

diff --git a/configure.ac b/configure.ac
--- 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"
diff --git a/scripts/plot/draw/private/__patch__.m b/scripts/plot/draw/private/__patch__.m
--- 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;