Unbundle libzip

ext/zip/config.m4

@@ -3,57 +3,17 @@ dnl config.m4 for extension zip
 PHP_ARG_ENABLE(zip, for zip archive read/writesupport,
 [  --enable-zip            Include Zip read/write support])
 
-if test -z "$PHP_ZLIB_DIR"; then
-  PHP_ARG_WITH(zlib-dir, for the location of libz,
-  [  --with-zlib-dir[=DIR]     ZIP: Set the path to libz install prefix], no, no)
-fi
-
-PHP_ARG_WITH(pcre-dir, pcre install prefix,
-[  --with-pcre-dir         ZIP: pcre install prefix], no, no)
-
 PHP_ARG_WITH(libzip, libzip,
 [  --with-libzip[=DIR]       ZIP: use libzip], yes, no)
 
 if test "$PHP_ZIP" != "no"; then
 
-  dnl libzip, depends on zlib
-  if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
-    if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
-      PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
-      PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib"
-    elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then
-      PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
-      PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
-    else
-      AC_MSG_ERROR([Can not find zlib headers under "$PHP_ZLIB_DIR"])
-    fi
-  else
-    for i in /usr/local /usr; do
-      if test -f "$i/include/zlib/zlib.h"; then
-        PHP_ZLIB_DIR="$i"
-        PHP_ZLIB_INCDIR="$i/include/zlib"
-      elif test -f "$i/include/zlib.h"; then
-        PHP_ZLIB_DIR="$i"
-        PHP_ZLIB_INCDIR="$i/include"
-      fi
-    done
-  fi
-
-  dnl # zlib
-  AC_MSG_CHECKING([for the location of zlib])
-  if test "$PHP_ZLIB_DIR" = "no"; then
-    AC_MSG_ERROR([zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located])
-  else
-    AC_MSG_RESULT([$PHP_ZLIB_DIR])
-    PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, ZIP_SHARED_LIBADD)
-    PHP_ADD_INCLUDE($PHP_ZLIB_INCDIR)
-  fi
+  PHP_ZIP_SOURCES="php_zip.c zip_stream.c"
 
   if test "$PHP_LIBZIP" != "no"; then
 
     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
-    dnl system libzip, depends on libzip
     AC_MSG_CHECKING(for libzip)
     if test -r $PHP_LIBZIP/include/zip.h; then
       LIBZIP_CFLAGS="-I$PHP_LIBZIP/include"
@@ -116,83 +76,12 @@ if test "$PHP_ZIP" != "no"; then
     ])
 
     AC_DEFINE(HAVE_ZIP,1,[ ])
-    PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c, $ext_shared,, $LIBZIP_CFLAGS)
-    PHP_SUBST(ZIP_SHARED_LIBADD)
+    PHP_NEW_EXTENSION(zip, $PHP_ZIP_SOURCES, $ext_shared,, $LIBZIP_CFLAGS)
   else
-    AC_MSG_WARN(========================================================)
-    AC_MSG_WARN(Use of bundled libzip is deprecated and will be removed.)
-    AC_MSG_WARN(Some features such as encryption and bzip2 are not available.)
-    AC_MSG_WARN(Use system library and --with-libzip is recommended.)
-    AC_MSG_WARN(========================================================)
-
-
-  PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_add_dir.c lib/zip_add_entry.c\
-			lib/zip_buffer.c lib/zip_file_set_mtime.c lib/zip_io_util.c lib/zip_source_begin_write.c \
-			lib/zip_source_call.c lib/zip_source_commit_write.c lib/zip_source_is_deleted.c \
-			lib/zip_source_remove.c lib/zip_source_rollback_write.c lib/zip_source_seek.c \
-			lib/zip_source_seek_write.c lib/zip_source_supports.c lib/zip_source_tell.c \
-			lib/zip_source_tell_write.c lib/zip_source_write.c \
-			lib/zip_close.c lib/zip_delete.c lib/zip_dir_add.c lib/zip_dirent.c lib/zip_discard.c lib/zip_entry.c\
-			lib/zip_err_str.c lib/zip_error.c lib/zip_error_clear.c lib/zip_error_get.c lib/zip_error_get_sys_type.c\
-			lib/zip_error_strerror.c lib/zip_error_to_str.c lib/zip_extra_field.c lib/zip_extra_field_api.c\
-			lib/zip_fclose.c lib/zip_fdopen.c lib/zip_file_add.c lib/zip_file_error_clear.c lib/zip_file_error_get.c\
-			lib/zip_file_get_comment.c lib/zip_file_get_offset.c lib/zip_file_rename.c lib/zip_file_replace.c\
-			lib/zip_file_set_comment.c lib/zip_file_strerror.c lib/zip_filerange_crc.c lib/zip_fopen.c\
-			lib/zip_file_get_external_attributes.c lib/zip_file_set_external_attributes.c \
-			lib/zip_fopen_encrypted.c lib/zip_fopen_index.c lib/zip_fopen_index_encrypted.c lib/zip_fread.c\
-			lib/zip_get_archive_comment.c lib/zip_get_archive_flag.c lib/zip_get_compression_implementation.c\
-			lib/zip_get_encryption_implementation.c lib/zip_get_file_comment.c lib/zip_get_name.c lib/zip_get_num_entries.c \
-			lib/zip_get_num_files.c lib/zip_memdup.c lib/zip_name_locate.c lib/zip_new.c lib/zip_open.c lib/zip_rename.c lib/zip_replace.c\
-			lib/zip_hash.c \
-			lib/zip_set_archive_comment.c lib/zip_set_archive_flag.c lib/zip_set_default_password.c lib/zip_set_file_comment.c\
-			lib/zip_set_file_compression.c lib/zip_set_name.c lib/zip_source_buffer.c lib/zip_source_close.c lib/zip_source_crc.c\
-			lib/zip_source_deflate.c lib/zip_source_error.c lib/zip_source_file.c lib/zip_source_filep.c lib/zip_source_free.c\
-			lib/zip_source_function.c lib/zip_source_layered.c lib/zip_source_open.c lib/zip_source_pkware.c \
-			lib/zip_source_read.c lib/zip_source_stat.c lib/zip_source_window.c lib/zip_source_zip.c lib/zip_source_zip_new.c\
-			lib/zip_stat.c lib/zip_stat_index.c lib/zip_stat_init.c lib/zip_strerror.c lib/zip_string.c lib/zip_unchange.c lib/zip_unchange_all.c\
-			lib/zip_unchange_archive.c lib/zip_unchange_data.c lib/zip_utf-8.c lib/mkstemp.c"
-
-  AC_DEFINE(HAVE_ZIP,1,[ ])
-  PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES, $ext_shared)
-  PHP_ADD_BUILD_DIR($ext_builddir/lib, 1)
-  PHP_ADD_INCLUDE([$ext_srcdir/lib])
-  PHP_SUBST(ZIP_SHARED_LIBADD)
-fi
-
-AC_CHECK_HEADERS(stdbool.h)
-AC_CHECK_HEADERS(fts.h)
-
-AC_CHECK_TYPES([int8_t])
-AC_CHECK_TYPES([int16_t])
-AC_CHECK_TYPES([int32_t])
-AC_CHECK_TYPES([int64_t])
-AC_CHECK_TYPES([uint8_t])
-AC_CHECK_TYPES([uint16_t])
-AC_CHECK_TYPES([uint32_t])
-AC_CHECK_TYPES([uint64_t])
-AC_CHECK_TYPES([ssize_t])
-
-AC_CHECK_SIZEOF([short])
-AC_CHECK_SIZEOF([int])
-AC_CHECK_SIZEOF([long])
-AC_CHECK_SIZEOF([long long])
-AC_CHECK_SIZEOF([off_t])
-if test "$ac_cv_sizeof_off_t" = "0" ; then
-  AC_MSG_ERROR(off_t undefined; check your library configuration)
-fi
-AC_CHECK_SIZEOF([size_t])
-
-AC_PATH_PROG([TOUCH], [touch])
-AC_PATH_PROG([UNZIP], [unzip])
-
-AC_STRUCT_TIMEZONE
+    AC_MSG_ERROR([libzip is no longer bundled: install libzip version >= 0.11 (1.3.0 recommended for encryption and bzip2 support)])
+  fi
 
-case $host_os
-in
-    *bsd*) MANFMT=mdoc;;
-    *) MANFMT=man;;
-esac
-AC_SUBST([MANFMT])
+  PHP_SUBST(ZIP_SHARED_LIBADD)
 
   dnl so we always include the known-good working hack.
   PHP_ADD_MAKEFILE_FRAGMENT