- #39952 zip ignoring --with-libdir on zlib checks (judas dot

  iscariote at gmail dot com)

diff --git a/NEWS b/NEWS
index e445de2c2e4a3cbfae33c3dee2c293fcd5d4e127..cff14aad7ab6e4d07b209eb8a07ca36abca0232c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,8 @@ PHP                                                                        NEWS
   __inet_pton() and inet_ntop() was named __inet_ntop(). (Hannes)
 - Fixed the validate email filter so that the letter "v" can also be used in
   the user part of the email address. (Derick)
+- Fixed bug #39952 (zip ignoring --with-libdir on zlib checks) (judas dot
+  iscariote at gmail dot com)
 - Fixed bug #39944 (References broken). (Dmitry)
 - Fixed bug #39935 (Extensions tidy,mcrypt,mhash,pdo_sqlite ignores
   --with-libdir). (judas dot iscariote at gmail dot com, Derick)

diff --git a/ext/zip/config.m4 b/ext/zip/config.m4
index e7907be21e6be63faaba9d545bb91a8aba07decf..a520903a165bb7b9971136f8544fd0679ab5b6c1 100644 (file)
--- a/ext/zip/config.m4
+++ b/ext/zip/config.m4
@@ -40,7 +40,7 @@ if test "$PHP_ZIP" != "no"; then
                AC_MSG_ERROR([zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located])
        else
                AC_MSG_RESULT([$PHP_ZLIB_DIR])
-               PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, ZIP_SHARED_LIBADD)
+               PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, ZIP_SHARED_LIBADD)
                PHP_ADD_INCLUDE($PHP_ZLIB_INCDIR)
        fi