From: H.J. Lu <hjl.tools@gmail.com>
Date: Wed, 1 Apr 2015 11:51:55 +0000 (-0700)
Subject: Unset zlibdir/zlibinc only for --with-system-zlib
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=031f1448b68a9eae3392353857c7873f857c2221;p=deliverable%2Fbinutils-gdb.git

Unset zlibdir/zlibinc only for --with-system-zlib

	* zlib.m4 (AM_ZLIB): Unset zlibdir and zlibinc only for
	--with-system-zlib.
---

diff --git a/config/ChangeLog b/config/ChangeLog
index 945f080249..6dc499891f 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* zlib.m4 (AM_ZLIB): Unset zlibdir and zlibinc only for
+	--with-system-zlib.
+
 2015-03-31  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* zlib.m4 (AM_ZLIB): Replace --with-zlib with --with-system-zlib.
diff --git a/config/zlib.m4 b/config/zlib.m4
index 366429568e..aa3ac48692 100644
--- a/config/zlib.m4
+++ b/config/zlib.m4
@@ -9,8 +9,10 @@ AC_DEFUN([AM_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)