From 895f3c08affbc3cad443d3344aa97e068a6f904e Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Date: Fri, 27 Apr 2018 08:54:57 +0000
Subject: Follow up fix for --with-system-zlib=no handling.

Change-Id: I4e8b179e2a2c68ffb9e6d3a2e35fee71618f9f5b
---
 gcc/configure    | 6 ++++--
 gcc/configure.ac | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gcc/configure b/gcc/configure
index d91fde1e7b1..ca5f39544df 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -28041,8 +28041,10 @@ zlibinc="-I\$(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
 
diff --git a/gcc/configure.ac b/gcc/configure.ac
index e9d10a97ac6..a0ec44b3af6 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -5435,8 +5435,10 @@ zlibdir=-L../zlib
 zlibinc="-I\$(srcdir)/../zlib"
 AC_ARG_WITH(system-zlib,
 [AS_HELP_STRING([--with-system-zlib], [use installed libz])],
-zlibdir=
-zlibinc=
+if test x$with_system_zlib = xyes ; then
+  zlibdir=
+  zlibinc=
+fi
 )
 AC_SUBST(zlibdir)
 AC_SUBST(zlibinc)
-- 
cgit v1.2.3