From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 5 Sep 2019 08:39:04 +0000 (+0200)
Subject: Remove --with-zlib-dir option from mysqlnd config
X-Git-Tag: php-7.4.0RC2~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2c21e10b278988910c77afd86d046db9a5c86e0;p=php

Remove --with-zlib-dir option from mysqlnd config

mysqlnd doesn't actually use this. PDO MySQL uses it, but also
declares it separately.
---

diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4
index fa5f856141..4084c7250b 100644
--- a/ext/mysqlnd/config9.m4
+++ b/ext/mysqlnd/config9.m4
@@ -13,15 +13,6 @@ PHP_ARG_ENABLE([mysqlnd_compression_support],
   [yes],
   [no])
 
-if test -z "$PHP_ZLIB_DIR"; then
-  PHP_ARG_WITH([zlib-dir],
-    [for the location of libz],
-    [AS_HELP_STRING([[--with-zlib-dir[=DIR]]],
-      [mysqlnd: Set the path to libz install prefix])],
-    [no],
-    [no])
-fi
-
 dnl If some extension uses mysqlnd it will get compiled in PHP core
 if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
   mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"