From 96a58590dd57e67e7ef65f1dee8ee9fa2c460457 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hongjiu.lu@intel.com>
Date: Tue, 14 Jul 2015 14:25:35 +0000
Subject: [PATCH] This patch syncs zlib.m4 with binutils-gdb and uses AM_ZLIB
 from zlib.m4 in gcc/configure.ac.

config/

	* zlib.m4: Sync with binutils-gdb.

gcc/

	* Makefile.in (top_srcdir): New.
	* configure.ac: Use AM_ZLIB.
	* configure: Regeneated.

From-SVN: r225774
---
 config/ChangeLog |  4 ++++
 config/zlib.m4   | 27 ++++++++++++++-------------
 gcc/ChangeLog    |  6 ++++++
 gcc/Makefile.in  |  3 +++
 gcc/aclocal.m4   |  1 +
 gcc/configure    | 13 +++++++++----
 gcc/configure.ac | 10 +---------
 7 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/config/ChangeLog b/config/ChangeLog
index 843ad7261e5..311378e2e77 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* zlib.m4: Sync with binutils-gdb.
+
 2015-06-30  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* dfp.m4 (enable_decimal_float): Also set to yes for
diff --git a/config/zlib.m4 b/config/zlib.m4
index b0174994ec1..afa57d112e7 100644
--- a/config/zlib.m4
+++ b/config/zlib.m4
@@ -1,18 +1,19 @@
-dnl A function to check for zlib availability.  zlib is used by default
-dnl unless the user configured with --disable-nls.
+dnl A function to check if the system's zlib library should be used.  The
+dnl builtin zlib dnl is used by default unless the user configured with
+dnl --with-system-zlib.
 
 AC_DEFUN([AM_ZLIB],
 [
-  # See if the user specified whether he wants zlib support or not.
-  AC_ARG_WITH(zlib,
-    [  --with-zlib             include zlib support (auto/yes/no) [default=auto]],
-    [], [with_zlib=auto])
-
-  if test "$with_zlib" != "no"; then
-    AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
-    if test "$with_zlib" = "yes" -a "$ac_cv_header_zlib_h" != "yes"; then
-      AC_MSG_ERROR([zlib (libz) library was explicitly requested but not found])
-    fi
+  # Use the system's zlib library.
+  zlibdir="-L\$(top_builddir)/../zlib"
+  zlibinc="-I\$(top_srcdir)/../zlib"
+  AC_ARG_WITH(system-zlib,
+  [AS_HELP_STRING([--with-system-zlib], [use installed libz])],
+  if test x$with_system_zlib = xyes ; then
+    zlibdir=
+    zlibinc=
   fi
+  )
+  AC_SUBST(zlibdir)
+  AC_SUBST(zlibinc)
 ])
-
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f31f648f9e8..a34eb8d975d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.in (top_srcdir): New.
+	* configure.ac: Use AM_ZLIB.
+	* configure: Regeneated.
+
 2015-07-14  Matthias Klose  <doko@ubuntu.com>
 
 	PR target/66840
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 181702517cc..bf2186a24ee 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -79,6 +79,9 @@ gcc_docdir = @srcdir@/doc
 abs_srcdir = @abs_srcdir@
 abs_docdir = @abs_srcdir@/doc
 
+# Directory where sources are, relative to here.
+top_srcdir = @top_srcdir@
+
 # Top build directory for this package, relative to here.
 top_builddir = .
 
diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4
index 49fea104f45..84f8abb8bb0 100644
--- a/gcc/aclocal.m4
+++ b/gcc/aclocal.m4
@@ -35,4 +35,5 @@ m4_include([../config/picflag.m4])
 m4_include([../config/progtest.m4])
 m4_include([../config/stdint.m4])
 m4_include([../config/warnings.m4])
+m4_include([../config/zlib.m4])
 m4_include([acinclude.m4])
diff --git a/gcc/configure b/gcc/configure
index 9561e5c71cc..e0755f9ba82 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -28108,13 +28108,17 @@ fi
 
 
 # Use the system's zlib library.
-zlibdir=-L../zlib
-zlibinc="-I\$(srcdir)/../zlib"
+
+  # Use the system's zlib library.
+  zlibdir="-L\$(top_builddir)/../zlib"
+  zlibinc="-I\$(top_srcdir)/../zlib"
 
 # Check whether --with-system-zlib was given.
 if test "${with_system_zlib+set}" = set; then :
-  withval=$with_system_zlib; zlibdir=
-zlibinc=
+  withval=$with_system_zlib; if test x$with_system_zlib = xyes ; then
+    zlibdir=
+    zlibinc=
+  fi
 
 fi
 
@@ -28122,6 +28126,7 @@ fi
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
diff --git a/gcc/configure.ac b/gcc/configure.ac
index cb1463930c6..7af6dbd3bec 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -5385,15 +5385,7 @@ fi
 AC_SUBST(HOST_LIBS)
 
 # Use the system's zlib library.
-zlibdir=-L../zlib
-zlibinc="-I\$(srcdir)/../zlib"
-AC_ARG_WITH(system-zlib,
-[AS_HELP_STRING([--with-system-zlib], [use installed libz])],
-zlibdir=
-zlibinc=
-)
-AC_SUBST(zlibdir)
-AC_SUBST(zlibinc)
+AM_ZLIB
 
 dnl Very limited version of automake's enable-maintainer-mode