com php-src: check for zlib headers as well as lib for mysqlnd: ext/mysqlnd/config.w32
| From: | Anatol Belski | Date: | Fri, 17 Oct 2014 08:09:40 +0000 |
| Subject: | com php-src: check for zlib headers as well as lib for mysqlnd: ext/mysqlnd/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82388@lists.php.net to get a copy of this message | ||
Commit: 1f6bd981433cdfc90238a95aa7339d72e7f2bc01
Author: Anatol Belski <ab@php.net> Fri, 17 Oct 2014 10:08:50 +0200
Parents: 35d703d00a5d434173424d563b3eb2c6213d5059
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1f6bd981433cdfc90238a95aa7339d72e7f2bc01
Log:
check for zlib headers as well as lib for mysqlnd
Changed paths:
M ext/mysqlnd/config.w32
Diff:
diff --git a/ext/mysqlnd/config.w32 b/ext/mysqlnd/config.w32
index c803042..b13a815 100644
--- a/ext/mysqlnd/config.w32
+++ b/ext/mysqlnd/config.w32
@@ -26,8 +26,11 @@ if (PHP_MYSQLND != "no") {
"mysqlnd_wireprotocol.c " +
"php_mysqlnd.c ";
EXTENSION("mysqlnd", mysqlnd_source, false);
- if (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib",
"mysqlnd", PHP_MYSQLND))) ||
- (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "mysqlnd", PHP_MYSQLND))
|| (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
+ if ((((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib",
"mysqlnd", PHP_MYSQLND))) ||
+ (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "mysqlnd", PHP_MYSQLND))
||
+ (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) &&
+ CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" +
php_usual_include_suspects)
+ )
{
AC_DEFINE("MYSQLND_COMPRESSION_ENABLED", 1, "Compression support");
AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "SSL support");