From 031f1448b68a9eae3392353857c7873f857c2221 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 1 Apr 2015 04:51:55 -0700 Subject: [PATCH] Unset zlibdir/zlibinc only for --with-system-zlib * zlib.m4 (AM_ZLIB): Unset zlibdir and zlibinc only for --with-system-zlib. --- config/ChangeLog | 5 +++++ config/zlib.m4 | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 945f080249c..6dc499891f6 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2015-04-01 H.J. Lu + + * zlib.m4 (AM_ZLIB): Unset zlibdir and zlibinc only for + --with-system-zlib. + 2015-03-31 H.J. Lu * zlib.m4 (AM_ZLIB): Replace --with-zlib with --with-system-zlib. diff --git a/config/zlib.m4 b/config/zlib.m4 index 366429568e9..aa3ac48692b 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) -- 2.30.2