From: Peter Kokot <peterkokot@gmail.com>
Date: Sun, 21 Jul 2019 09:31:23 +0000 (+0200)
Subject: Remove HAVE_LIBZIP
X-Git-Tag: php-7.4.0beta1~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15782b27b8ad34204470d4ce9f464a7be0e4e1a6;p=php

Remove HAVE_LIBZIP

The libzip library is now always used from the system.

Closes GH-4450
---

diff --git a/ext/zip/config.m4 b/ext/zip/config.m4
index ae7535f620..0b151b7f2a 100644
--- a/ext/zip/config.m4
+++ b/ext/zip/config.m4
@@ -9,8 +9,6 @@ if test "$PHP_ZIP" != "no"; then
   PHP_EVAL_INCLINE($LIBZIP_CFLAGS)
   PHP_EVAL_LIBLINE($LIBZIP_LIBS, ZIP_SHARED_LIBADD)
 
-  AC_DEFINE(HAVE_LIBZIP, 1, [ ])
-
   PHP_CHECK_LIBRARY(zip, zip_file_set_encryption,
   [
     AC_DEFINE(HAVE_ENCRYPTION, 1, [Libzip >= 1.2.0 with encryption support])
diff --git a/ext/zip/config.w32 b/ext/zip/config.w32
index 17fbbc9806..2ac637189c 100644
--- a/ext/zip/config.w32
+++ b/ext/zip/config.w32
@@ -15,7 +15,6 @@ if (PHP_ZIP != "no") {
 		}
 
 		AC_DEFINE('HAVE_ZIP', 1);
-		AC_DEFINE('HAVE_LIBZIP', 1);
 		ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_ENCRYPTION");
 	} else {
 		WARNING("zip not enabled; libraries and headers not found");
diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h
index 191be54101..0ac9189583 100644
--- a/ext/zip/php_zip.h
+++ b/ext/zip/php_zip.h
@@ -27,11 +27,7 @@ extern zend_module_entry zip_module_entry;
 #include "TSRM.h"
 #endif
 
-#if defined(HAVE_LIBZIP)
 #include <zip.h>
-#else
-#include "lib/zip.h"
-#endif
 
 #ifndef ZIP_OVERWRITE
 #define ZIP_OVERWRITE ZIP_TRUNCATE