From: Hugh McMaster <hugh.mcmaster@outlook.com>
Date: Mon, 3 Jun 2019 10:22:03 +0000 (+1000)
Subject: ext/zip: Replace $LIBZIP_LIBDIR with $LIBZIP_LIBS
X-Git-Tag: php-7.4.0alpha1~93
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9830f1c2c936e766d3615ea7c4f37990e51a113;p=php

ext/zip: Replace $LIBZIP_LIBDIR with $LIBZIP_LIBS

Closes GH-4220.
---

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,[ ])