Skip to content

Commit 310f96f

Browse files
hughmcmasternikic
authored andcommitted
ext/zip: Add PHP_EVAL_LIBLINE to replace PHP_ADD_LIBRARY_WITH_PATH
1 parent 7ec50c2 commit 310f96f

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

ext/zip/config.m4

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ if test "$PHP_ZIP" != "no"; then
77
PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11])
88

99
PHP_EVAL_INCLINE($LIBZIP_CFLAGS)
10+
PHP_EVAL_LIBLINE($LIBZIP_LIBS, ZIP_SHARED_LIBADD)
1011
LIBZIP_LIBDIR=`$PKG_CONFIG --variable=libdir libzip`
1112

1213
dnl Could not think of a simple way to check libzip for overwrite support
1314
PHP_CHECK_LIBRARY(zip, zip_open,
1415
[
15-
PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_LIBDIR, ZIP_SHARED_LIBADD)
1616
AC_DEFINE(HAVE_LIBZIP,1,[ ])
1717
], [
1818
AC_MSG_ERROR(could not find usable libzip)
@@ -22,7 +22,6 @@ if test "$PHP_ZIP" != "no"; then
2222

2323
PHP_CHECK_LIBRARY(zip, zip_file_set_encryption,
2424
[
25-
PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_LIBDIR, ZIP_SHARED_LIBADD)
2625
AC_DEFINE(HAVE_ENCRYPTION, 1, [Libzip >= 1.2.0 with encryption support])
2726
], [
2827
AC_MSG_WARN(Libzip >= 1.2.0 needed for encryption support)

0 commit comments

Comments
 (0)