From c9830f1c2c936e766d3615ea7c4f37990e51a113 Mon Sep 17 00:00:00 2001 From: Hugh McMaster Date: Mon, 3 Jun 2019 20:22:03 +1000 Subject: [PATCH] ext/zip: Replace $LIBZIP_LIBDIR with $LIBZIP_LIBS Closes GH-4220. --- ext/zip/config.m4 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index 70eafcdc98..ae7535f620 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -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,[ ]) -- 2.50.1