Skip to content

Commit 68e2072

Browse files
committed
ext/zip: Raise required library version to 1.0.1
The function zip_open was added in libzip 1.0. If this version is not available, configure will exit with a fatal error.
1 parent 15cdc6d commit 68e2072

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

ext/zip/config.m4

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,10 @@ PHP_ARG_WITH([zip],
44
[Include Zip read/write support])])
55

66
if test "$PHP_ZIP" != "no"; then
7-
PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11])
7+
PKG_CHECK_MODULES([LIBZIP], [libzip >= 1.0.1])
88
LIBZIP_LIBDIR=`$PKG_CONFIG --variable=libdir libzip`
99

10-
dnl Could not think of a simple way to check libzip for overwrite support
11-
PHP_CHECK_LIBRARY(zip, zip_open,
12-
[
13-
PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_LIBDIR, ZIP_SHARED_LIBADD)
14-
AC_DEFINE(HAVE_LIBZIP,1,[ ])
15-
], [
16-
AC_MSG_ERROR(could not find usable libzip)
17-
], [
18-
-L$LIBZIP_LIBDIR
19-
])
10+
AC_DEFINE(HAVE_LIBZIP, 1, [ ])
2011

2112
PHP_CHECK_LIBRARY(zip, zip_file_set_encryption,
2213
[

0 commit comments

Comments
 (0)