# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1475171623 14400
# Node ID 05ab1526377a644b92450028d7e2231f63b08c95
# Parent  b749559245a11e00321ea811b4aa365043913b7b# Parent  acb3e59119d987592ae28258b52ba89cdfb6d990
maint: Merge stable to default.

diff -r b749559245a1 -r 05ab1526377a configure.ac
--- a/configure.ac	Thu Sep 29 11:26:59 2016 -0400
+++ b/configure.ac	Thu Sep 29 13:53:43 2016 -0400
@@ -65,7 +65,7 @@
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability -Wno-override tar-ustar subdir-objects])
+AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability -Wno-override tar-ustar subdir-objects dist-lzip])
 
 ## Add the option to enable silent rules and make silent rules the
 ## default behavior.  Available since Automake 1.11 and included by
diff -r b749559245a1 -r 05ab1526377a libinterp/corefcn/cdisplay.h
diff -r b749559245a1 -r 05ab1526377a oct-conf-post.in.h
diff -r b749559245a1 -r 05ab1526377a scripts/prefs/prefdir.m
diff -r b749559245a1 -r 05ab1526377a test/bug-35448/module.mk
diff -r b749559245a1 -r 05ab1526377a test/bug-36025/module.mk
diff -r b749559245a1 -r 05ab1526377a test/bug-38236/module.mk
diff -r b749559245a1 -r 05ab1526377a test/bug-38691/module.mk
diff -r b749559245a1 -r 05ab1526377a test/class-concat/module.mk
diff -r b749559245a1 -r 05ab1526377a test/classdef/module.mk
diff -r b749559245a1 -r 05ab1526377a test/ctor-vs-method/module.mk
diff -r b749559245a1 -r 05ab1526377a test/fcn-handle-derived-resolution/module.mk
diff -r b749559245a1 -r 05ab1526377a test/nest/module.mk