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 ae7535f6206e5d06f0db96f3b921f83d221fe3f9..0b151b7f2ae32d18482ec2bb534e14af69d5f956 100644 (file)
--- 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 17fbbc980626478577397d97684e68eb4ec8b4f9..2ac637189c65a0f3b881f724b1e2e6d183f07aca 100644 (file)
--- 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 191be54101eff0127e9cfc3ee365196544cbc360..0ac9189583cb81a57dbf576b99b4c00904c0dcdf 100644 (file)
--- 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