summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2006-12-26 09:52:05 +0000
committerPierre Joye <pajoye@php.net>2006-12-26 09:52:05 +0000
commit5a6f0e3059e9780e6054555eebee7205077953a0 (patch)
tree662a91e817008254b41e8b868e71ca42bbacdff8
parent67583e7aa5027df32e11a0aaa5b1820649a856b8 (diff)
downloadphp-git-5a6f0e3059e9780e6054555eebee7205077953a0.tar.gz
- #39952 zip ignoring --with-libdir on zlib checks (judas dot
iscariote at gmail dot com)
-rw-r--r--NEWS2
-rw-r--r--ext/zip/config.m42
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index e445de2c2e..cff14aad7a 100644
--- 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 e7907be21e..a520903a16 100644
--- 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