Update GCC to autoconf 2.69, automake 1.15.1 (PR bootstrap/82856).

[thirdparty/gcc.git] / zlib / ChangeLog.gcj

diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index 09bc9c26104ce052372679e895cd5eb83e65a167..bf62b7c8b27c2e1246c42bf92ddd2a5bffd9a61f 100644 (file)
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,3 +1,17 @@
+2018-10-31  Joseph Myers  <joseph@codesourcery.com>
+
+       PR bootstrap/82856
+       * Makefile.am: Include multilib.am.
+
+       Merge from binutils-gdb:
+       2018-06-19  Simon Marchi  <simon.marchi@ericsson.com>
+
+       * configure.ac: Modernize AC_INIT call, remove AC_PREREQ.
+       * Makefile.am (AUTOMAKE_OPTIONS): Remove 1.8, cygnus, add foreign.
+       * Makefile.in: Re-generate.
+       * aclocal.m4: Re-generate.
+       * configure: Re-generate.
+
 2017-03-15  Yaakov Selkowitz <yselkowitz@redhat.com>
 
        PR bootstrap/79771