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

ext/zip: Replace $LIBZIP_LIBDIR with $LIBZIP_LIBS

Browse source 
Closes GH-4220.
This commit is contained in:
Hugh McMaster 2019-06-03 20:22:03 +10:00 • committed by Nikita Popov
parent a982125561
commit c9830f1c2c
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/zip/config.m4
View file

@ -8,7 +8,6 @@ if test "$PHP_ZIP" != "no"; then
PHP_EVAL_INCLINE($LIBZIP_CFLAGS)
PHP_EVAL_LIBLINE($LIBZIP_LIBS, ZIP_SHARED_LIBADD)
LIBZIP_LIBDIR=`$PKG_CONFIG --variable=libdir libzip`
AC_DEFINE(HAVE_LIBZIP, 1, [ ])
@ -18,7 +17,7 @@ if test "$PHP_ZIP" != "no"; then
], [
AC_MSG_WARN(Libzip >= 1.2.0 needed for encryption support)
], [
-L$LIBZIP_LIBDIR
$LIBZIP_LIBS
])
PHP_CHECK_LIBRARY(zip, zip_libzip_version,
@ -26,7 +25,7 @@ if test "$PHP_ZIP" != "no"; then
AC_DEFINE(HAVE_LIBZIP_VERSION, 1, [Libzip >= 1.3.1 with zip_libzip_version function])
], [
], [
-L$LIBZIP_LIBDIR
$LIBZIP_LIBS
])
AC_DEFINE(HAVE_ZIP,1,[ ])