Skip to content

Commit c099be4

Browse files
remicolletnikic
remicollet
authored and
nikic
committed
drop support for bundled libzip (linux)
1 parent a7b8131 commit c099be4

File tree

1 file changed

+5
-116
lines changed

1 file changed

+5
-116
lines changed

‎ext/zip/config.m4

Lines changed: 5 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -3,57 +3,17 @@ dnl config.m4 for extension zip
33
PHP_ARG_ENABLE(zip, for zip archive read/writesupport,
44
[ --enable-zip Include Zip read/write support])
55

6-
if test -z "$PHP_ZLIB_DIR"; then
7-
PHP_ARG_WITH(zlib-dir, for the location of libz,
8-
[ --with-zlib-dir[=DIR] ZIP: Set the path to libz install prefix], no, no)
9-
fi
10-
11-
PHP_ARG_WITH(pcre-dir, pcre install prefix,
12-
[ --with-pcre-dir ZIP: pcre install prefix], no, no)
13-
146
PHP_ARG_WITH(libzip, libzip,
157
[ --with-libzip[=DIR] ZIP: use libzip], yes, no)
168

179
if test "$PHP_ZIP" != "no"; then
1810

19-
dnl libzip, depends on zlib
20-
if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
21-
if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
22-
PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
23-
PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib"
24-
elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then
25-
PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
26-
PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
27-
else
28-
AC_MSG_ERROR([Can not find zlib headers under "$PHP_ZLIB_DIR"])
29-
fi
30-
else
31-
for i in /usr/local /usr; do
32-
if test -f "$i/include/zlib/zlib.h"; then
33-
PHP_ZLIB_DIR="$i"
34-
PHP_ZLIB_INCDIR="$i/include/zlib"
35-
elif test -f "$i/include/zlib.h"; then
36-
PHP_ZLIB_DIR="$i"
37-
PHP_ZLIB_INCDIR="$i/include"
38-
fi
39-
done
40-
fi
41-
42-
dnl # zlib
43-
AC_MSG_CHECKING([for the location of zlib])
44-
if test "$PHP_ZLIB_DIR" = "no"; then
45-
AC_MSG_ERROR([zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located])
46-
else
47-
AC_MSG_RESULT([$PHP_ZLIB_DIR])
48-
PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, ZIP_SHARED_LIBADD)
49-
PHP_ADD_INCLUDE($PHP_ZLIB_INCDIR)
50-
fi
11+
PHP_ZIP_SOURCES="php_zip.c zip_stream.c"
5112

5213
if test "$PHP_LIBZIP" != "no"; then
5314

5415
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
5516

56-
dnl system libzip, depends on libzip
5717
AC_MSG_CHECKING(for libzip)
5818
if test -r $PHP_LIBZIP/include/zip.h; then
5919
LIBZIP_CFLAGS="-I$PHP_LIBZIP/include"
@@ -116,83 +76,12 @@ if test "$PHP_ZIP" != "no"; then
11676
])
11777

11878
AC_DEFINE(HAVE_ZIP,1,[ ])
119-
PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c, $ext_shared,, $LIBZIP_CFLAGS)
120-
PHP_SUBST(ZIP_SHARED_LIBADD)
79+
PHP_NEW_EXTENSION(zip, $PHP_ZIP_SOURCES, $ext_shared,, $LIBZIP_CFLAGS)
12180
else
122-
AC_MSG_WARN(========================================================)
123-
AC_MSG_WARN(Use of bundled libzip is deprecated and will be removed.)
124-
AC_MSG_WARN(Some features such as encryption and bzip2 are not available.)
125-
AC_MSG_WARN(Use system library and --with-libzip is recommended.)
126-
AC_MSG_WARN(========================================================)
127-
128-
129-
PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_add_dir.c lib/zip_add_entry.c\
130-
lib/zip_buffer.c lib/zip_file_set_mtime.c lib/zip_io_util.c lib/zip_source_begin_write.c \
131-
lib/zip_source_call.c lib/zip_source_commit_write.c lib/zip_source_is_deleted.c \
132-
lib/zip_source_remove.c lib/zip_source_rollback_write.c lib/zip_source_seek.c \
133-
lib/zip_source_seek_write.c lib/zip_source_supports.c lib/zip_source_tell.c \
134-
lib/zip_source_tell_write.c lib/zip_source_write.c \
135-
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\
136-
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\
137-
lib/zip_error_strerror.c lib/zip_error_to_str.c lib/zip_extra_field.c lib/zip_extra_field_api.c\
138-
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\
139-
lib/zip_file_get_comment.c lib/zip_file_get_offset.c lib/zip_file_rename.c lib/zip_file_replace.c\
140-
lib/zip_file_set_comment.c lib/zip_file_strerror.c lib/zip_filerange_crc.c lib/zip_fopen.c\
141-
lib/zip_file_get_external_attributes.c lib/zip_file_set_external_attributes.c \
142-
lib/zip_fopen_encrypted.c lib/zip_fopen_index.c lib/zip_fopen_index_encrypted.c lib/zip_fread.c\
143-
lib/zip_get_archive_comment.c lib/zip_get_archive_flag.c lib/zip_get_compression_implementation.c\
144-
lib/zip_get_encryption_implementation.c lib/zip_get_file_comment.c lib/zip_get_name.c lib/zip_get_num_entries.c \
145-
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\
146-
lib/zip_hash.c \
147-
lib/zip_set_archive_comment.c lib/zip_set_archive_flag.c lib/zip_set_default_password.c lib/zip_set_file_comment.c\
148-
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\
149-
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\
150-
lib/zip_source_function.c lib/zip_source_layered.c lib/zip_source_open.c lib/zip_source_pkware.c \
151-
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\
152-
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\
153-
lib/zip_unchange_archive.c lib/zip_unchange_data.c lib/zip_utf-8.c lib/mkstemp.c"
154-
155-
AC_DEFINE(HAVE_ZIP,1,[ ])
156-
PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES, $ext_shared)
157-
PHP_ADD_BUILD_DIR($ext_builddir/lib, 1)
158-
PHP_ADD_INCLUDE([$ext_srcdir/lib])
159-
PHP_SUBST(ZIP_SHARED_LIBADD)
160-
fi
161-
162-
AC_CHECK_HEADERS(stdbool.h)
163-
AC_CHECK_HEADERS(fts.h)
164-
165-
AC_CHECK_TYPES([int8_t])
166-
AC_CHECK_TYPES([int16_t])
167-
AC_CHECK_TYPES([int32_t])
168-
AC_CHECK_TYPES([int64_t])
169-
AC_CHECK_TYPES([uint8_t])
170-
AC_CHECK_TYPES([uint16_t])
171-
AC_CHECK_TYPES([uint32_t])
172-
AC_CHECK_TYPES([uint64_t])
173-
AC_CHECK_TYPES([ssize_t])
174-
175-
AC_CHECK_SIZEOF([short])
176-
AC_CHECK_SIZEOF([int])
177-
AC_CHECK_SIZEOF([long])
178-
AC_CHECK_SIZEOF([long long])
179-
AC_CHECK_SIZEOF([off_t])
180-
if test "$ac_cv_sizeof_off_t" = "0" ; then
181-
AC_MSG_ERROR(off_t undefined; check your library configuration)
182-
fi
183-
AC_CHECK_SIZEOF([size_t])
184-
185-
AC_PATH_PROG([TOUCH], [touch])
186-
AC_PATH_PROG([UNZIP], [unzip])
187-
188-
AC_STRUCT_TIMEZONE
81+
AC_MSG_ERROR([libzip is no longer bundled: install libzip version >= 0.11 (1.3.0 recommended for encryption and bzip2 support)])
82+
fi
18983

190-
case $host_os
191-
in
192-
*bsd*) MANFMT=mdoc;;
193-
*) MANFMT=man;;
194-
esac
195-
AC_SUBST([MANFMT])
84+
PHP_SUBST(ZIP_SHARED_LIBADD)
19685

19786
dnl so we always include the known-good working hack.
19887
PHP_ADD_MAKEFILE_FRAGMENT

0 commit comments

Comments
 (0)