From cf992ed4c6887e2bd8612cadcbc7ca749d942b5e Mon Sep 17 00:00:00 2001 From: Hugh McMaster Date: Sun, 2 Jun 2019 10:23:28 +1000 Subject: [PATCH 1/2] ext/zip: Add PHP_EVAL_LIBLINE to replace PHP_ADD_LIBRARY_WITH_PATH --- ext/zip/config.m4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index 11b722492f1e..25fac2be208a 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -7,12 +7,12 @@ if test "$PHP_ZIP" != "no"; then PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11]) PHP_EVAL_INCLINE($LIBZIP_CFLAGS) + PHP_EVAL_LIBLINE($LIBZIP_LIBS, ZIP_SHARED_LIBADD) LIBZIP_LIBDIR=`$PKG_CONFIG --variable=libdir libzip` dnl Could not think of a simple way to check libzip for overwrite support PHP_CHECK_LIBRARY(zip, zip_open, [ - PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_LIBDIR, ZIP_SHARED_LIBADD) AC_DEFINE(HAVE_LIBZIP,1,[ ]) ], [ AC_MSG_ERROR(could not find usable libzip) @@ -22,7 +22,6 @@ if test "$PHP_ZIP" != "no"; then PHP_CHECK_LIBRARY(zip, zip_file_set_encryption, [ - PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_LIBDIR, ZIP_SHARED_LIBADD) AC_DEFINE(HAVE_ENCRYPTION, 1, [Libzip >= 1.2.0 with encryption support]) ], [ AC_MSG_WARN(Libzip >= 1.2.0 needed for encryption support) From 03e552bf9a22101c1182546e13a69b0cf753d404 Mon Sep 17 00:00:00 2001 From: Hugh McMaster Date: Sun, 2 Jun 2019 10:25:13 +1000 Subject: [PATCH 2/2] ext/zip: Remove un-needed symbol check for zip_open --- ext/zip/config.m4 | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index 25fac2be208a..70eafcdc98e5 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -10,15 +10,7 @@ if test "$PHP_ZIP" != "no"; then PHP_EVAL_LIBLINE($LIBZIP_LIBS, ZIP_SHARED_LIBADD) LIBZIP_LIBDIR=`$PKG_CONFIG --variable=libdir libzip` - dnl Could not think of a simple way to check libzip for overwrite support - PHP_CHECK_LIBRARY(zip, zip_open, - [ - AC_DEFINE(HAVE_LIBZIP,1,[ ]) - ], [ - AC_MSG_ERROR(could not find usable libzip) - ], [ - -L$LIBZIP_LIBDIR - ]) + AC_DEFINE(HAVE_LIBZIP, 1, [ ]) PHP_CHECK_LIBRARY(zip, zip_file_set_encryption, [