archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3' into PHP-7.4

Browse source
This commit is contained in:
Nikita Popov 2019-05-27 17:44:11 +02:00
commit adec208bdb
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/zip/config.m4
View file

@ -5,6 +5,8 @@ PHP_ARG_WITH([zip],
if test "$PHP_ZIP" != "no"; then if test "$PHP_ZIP" != "no"; then
PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11]) PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11])
PHP_EVAL_INCLINE($LIBZIP_CFLAGS)
LIBZIP_LIBDIR=`$PKG_CONFIG --variable=libdir libzip` LIBZIP_LIBDIR=`$PKG_CONFIG --variable=libdir libzip`
dnl Could not think of a simple way to check libzip for overwrite support dnl Could not think of a simple way to check libzip for overwrite support
@ -39,7 +41,7 @@ if test "$PHP_ZIP" != "no"; then
AC_DEFINE(HAVE_ZIP,1,[ ]) AC_DEFINE(HAVE_ZIP,1,[ ])
PHP_ZIP_SOURCES="php_zip.c zip_stream.c" PHP_ZIP_SOURCES="php_zip.c zip_stream.c"
PHP_NEW_EXTENSION(zip, $PHP_ZIP_SOURCES, $ext_shared,, $LIBZIP_CFLAGS) PHP_NEW_EXTENSION(zip, $PHP_ZIP_SOURCES, $ext_shared)
PHP_SUBST(ZIP_SHARED_LIBADD) PHP_SUBST(ZIP_SHARED_LIBADD)