diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-27 17:44:11 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-27 17:44:11 +0200 |
| commit | adec208bdb8ab05bb1b9ebd3a19dba914e1777df (patch) | |
| tree | 5de66ed56ef90df2ec8fb38ff06a72a7fba17d37 /ext/zip | |
| parent | fd23f9104a9772234a3469e341500cf1b9503f63 (diff) | |
| parent | 0cb43ec51c0cbb7971bedd6be8ca80aba01c74a8 (diff) | |
| download | php-git-adec208bdb8ab05bb1b9ebd3a19dba914e1777df.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
Diffstat (limited to 'ext/zip')
| -rw-r--r-- | ext/zip/config.m4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index 0889d3693d..11b722492f 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -5,6 +5,8 @@ PHP_ARG_WITH([zip], if test "$PHP_ZIP" != "no"; then PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11]) + + PHP_EVAL_INCLINE($LIBZIP_CFLAGS) LIBZIP_LIBDIR=`$PKG_CONFIG --variable=libdir libzip` 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,[ ]) 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) |