com php-src: ext/zip: Add PHP_EVAL_LIBLINE to replace PHP_ADD_LIBRARY_WITH_PATH: ext/zip/config.m4

From: Date: Mon, 03 Jun 2019 07:20:12 +0000
Subject: com php-src: ext/zip: Add PHP_EVAL_LIBLINE to replace PHP_ADD_LIBRARY_WITH_PATH: ext/zip/config.m4
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-106517@lists.php.net to get a copy of this message
Commit: 310f96fd13dbe53754818f279ba63ecce1966173 Author: Hugh McMaster <hugh.mcmaster@outlook.com> Sun, 2 Jun 2019 10:23:28 +1000 Committer: Nikita Popov <nikita.ppv@gmail.com> Mon, 3 Jun 2019 09:20:12 +0200 Parents: 7ec50c24bb8702f80e49052b923b71aa2320ff82 Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=310f96fd13dbe53754818f279ba63ecce1966173 Log: ext/zip: Add PHP_EVAL_LIBLINE to replace PHP_ADD_LIBRARY_WITH_PATH Changed paths: M ext/zip/config.m4 Diff: diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index 11b7224..25fac2b 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)

« previous php.cvs (#106517) next »