From f62c27dc7e6cb11e6fe8bcd6164a1483958bf9be Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Thu, 14 Sep 2023 07:56:11 +0200 Subject: [PATCH] The --with-zlib-dir is unused and has been removed Commits that removed this option: - 34dd032e4e70a33e3e8fa27e38af62f63601b447 - a2c21e10b278988910c77afd86d046db9a5c86e0 - e595f5cd8a4a00ca04e36ba1e78f14805dbecead --- .cirrus.yml | 1 - .github/actions/configure-x32/action.yml | 1 - .github/actions/configure-x64/action.yml | 1 - ext/pdo_mysql/config.m4 | 9 --------- travis/compile.sh | 1 - 5 files changed, 13 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index a5910b7821367..c1b17f3eb4260 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -131,7 +131,6 @@ arm_task: --enable-exif --with-zip --with-zlib - --with-zlib-dir=/usr --enable-soap --enable-xmlreader --with-xsl diff --git a/.github/actions/configure-x32/action.yml b/.github/actions/configure-x32/action.yml index cc8fe6538400e..b34db0cd34233 100644 --- a/.github/actions/configure-x32/action.yml +++ b/.github/actions/configure-x32/action.yml @@ -35,7 +35,6 @@ runs: --enable-exif \ --with-zip \ --with-zlib \ - --with-zlib-dir=/usr \ --enable-soap \ --enable-xmlreader \ --with-xsl \ diff --git a/.github/actions/configure-x64/action.yml b/.github/actions/configure-x64/action.yml index 6492b252470ec..f331b32a12d4e 100644 --- a/.github/actions/configure-x64/action.yml +++ b/.github/actions/configure-x64/action.yml @@ -33,7 +33,6 @@ runs: --enable-exif \ --with-zip \ --with-zlib \ - --with-zlib-dir=/usr \ --enable-soap \ --enable-xmlreader \ --with-xsl \ diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4 index 7f09aabefa73a..9b382046590fb 100644 --- a/ext/pdo_mysql/config.m4 +++ b/ext/pdo_mysql/config.m4 @@ -4,15 +4,6 @@ PHP_ARG_WITH([pdo-mysql], [PDO: MySQL support. DIR is the MySQL base directory. If no value or mysqlnd is passed as DIR, the MySQL native driver will be used])]) -if test -z "$PHP_ZLIB_DIR"; then - PHP_ARG_WITH([zlib-dir], - [for the location of libz], - [AS_HELP_STRING([[--with-zlib-dir[=DIR]]], - [PDO_MySQL: Set the path to libz install prefix])], - [no], - [no]) -fi - if test "$PHP_PDO_MYSQL" != "no"; then dnl This depends on ext/mysqli/config.m4 providing the PHP_MYSQL_SOCKET_SEARCH dnl macro and --with-mysql-sock configure option. diff --git a/travis/compile.sh b/travis/compile.sh index 8cccc7b883347..2c93b7cda279b 100755 --- a/travis/compile.sh +++ b/travis/compile.sh @@ -41,7 +41,6 @@ $S390X_CONFIG \ --enable-exif \ --with-zip \ --with-zlib \ ---with-zlib-dir=/usr \ --enable-soap \ --enable-xmlreader \ --with-xsl \