1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #75143 new method setEncryptionName() seems not to exist in ZipArchive
This commit is contained in:
Anatol Belski
2017-09-01 10:53:50 +02:00
+1 -1
View File
@@ -16,7 +16,7 @@ if (PHP_ZIP != "no") {
AC_DEFINE('HAVE_ZIP', 1);
AC_DEFINE('HAVE_LIBZIP', 1);
ADD_FLAG("CFLAGS_ZIP", "/D _WIN32");
ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_ENCRYPTION");
} else if (CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS_ZIP", "..\\zlib;" + PHP_ZIP) &&
CHECK_HEADER_ADD_INCLUDE("zipconf.h", "CFLAGS_ZIP", configure_module_dirname + "\\lib;" + PHP_ZIP) &&
(((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib", "zip", PHP_ZIP) || CHECK_LIB("zlib.lib", "zip", PHP_ZIP))) ||