andrey Wed, 23 Mar 2011 17:14:28 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=309609
Log:
Fix compressed build, make it easier
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U php/php-src/trunk/ext/mysqlnd/config9.m4
U php/php-src/trunk/ext/mysqlnd/mysqlnd.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2011-03-23 16:37:19 UTC
(rev 309608)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2011-03-23 17:14:28 UTC
(rev 309609)
@@ -3,9 +3,9 @@
dnl config.m4 for mysqlnd driver
-PHP_ARG_ENABLE(disable_mysqlnd_compression_support, whether to disable
compressed protocol support in mysqlnd,
+PHP_ARG_ENABLE(mysqlnd_compression_support, whether to enable compressed
protocol support in mysqlnd,
[ --disable-mysqlnd-compression-support
- Disable support for the MySQL compressed protocol
in mysqlnd], yes)
+ Disable support for the MySQL compressed protocol
in mysqlnd], yes, no)
if test -z "$PHP_ZLIB_DIR"; then
PHP_ARG_WITH(zlib-dir, for the location of libz,
@@ -14,26 +14,22 @@
dnl If some extension uses mysqlnd it will get compiled in PHP core
if test "$PHP_MYSQLND_ENABLED" = "yes"; then
- mysqlnd_sources="mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
- mysqlnd_ps.c mysqlnd_loaddata.c mysqlnd_net.c \
- mysqlnd_ps_codec.c mysqlnd_statistics.c \
+ mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"
+ mysqlnd_base_sources="mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
+ mysqlnd_loaddata.c mysqlnd_net.c mysqlnd_statistics.c \
mysqlnd_result.c mysqlnd_result_meta.c
mysqlnd_debug.c\
mysqlnd_block_alloc.c php_mysqlnd.c"
- PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
- PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
- PHP_INSTALL_HEADERS([ext/mysqlnd/])
- dnl Windows uses config.w32 thus this code is safe for now
-
if test "$PHP_MYSQLND_COMPRESSION_SUPPORT" != "no"; then
- if test -z "$PHP_ZLIB_DIR"; then
- AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol
support])
- PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, MYSQLND_SHARED_LIBADD)
- MYSQLND_LIBS="$MYSQLND_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
- fi
+ AC_DEFINE([MYSQLND_COMPRESSION_WANTED], 1, [Enable compressed protocol
support])
fi
AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])
+
+ mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
+ PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
+ PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
+ PHP_INSTALL_HEADERS([ext/mysqlnd/])
fi
if test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h 2011-03-23 16:37:19 UTC
(rev 309608)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h 2011-03-23 17:14:28 UTC
(rev 309609)
@@ -50,6 +50,10 @@
#define MYSQLND_DBG_ENABLED 0
#endif
+#if defined(MYSQLND_COMPRESSION_WANTED) && defined(HAVE_ZLIB)
+#define MYSQLND_COMPRESSION_ENABLED 1
+#endif
+
#ifdef ZTS
#include "TSRM.h"
#endif
Modified: php/php-src/trunk/ext/mysqlnd/config9.m4
===================================================================
--- php/php-src/trunk/ext/mysqlnd/config9.m4 2011-03-23 16:37:19 UTC (rev
309608)
+++ php/php-src/trunk/ext/mysqlnd/config9.m4 2011-03-23 17:14:28 UTC (rev
309609)
@@ -3,9 +3,9 @@
dnl config.m4 for mysqlnd driver
-PHP_ARG_ENABLE(disable_mysqlnd_compression_support, whether to disable
compressed protocol support in mysqlnd,
+PHP_ARG_ENABLE(mysqlnd_compression_support, whether to enable compressed
protocol support in mysqlnd,
[ --disable-mysqlnd-compression-support
- Disable support for the MySQL compressed protocol
in mysqlnd], yes)
+ Disable support for the MySQL compressed protocol
in mysqlnd], yes, no)
if test -z "$PHP_ZLIB_DIR"; then
PHP_ARG_WITH(zlib-dir, for the location of libz,
@@ -14,26 +14,23 @@
dnl If some extension uses mysqlnd it will get compiled in PHP core
if test "$PHP_MYSQLND_ENABLED" = "yes"; then
- mysqlnd_sources="mysqlnd.c mysqlnd_alloc.c mysqlnd_bt.c mysqlnd_charset.c
mysqlnd_wireprotocol.c \
- mysqlnd_ps.c mysqlnd_loaddata.c mysqlnd_net.c \
- mysqlnd_ps_codec.c mysqlnd_statistics.c mysqlnd_auth.c \
+ mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"
+ mysqlnd_base_sources="mysqlnd.c mysqlnd_alloc.c mysqlnd_bt.c
mysqlnd_charset.c mysqlnd_wireprotocol.c \
+ mysqlnd_loaddata.c mysqlnd_net.c \
+ mysqlnd_statistics.c mysqlnd_auth.c \
mysqlnd_result.c mysqlnd_result_meta.c
mysqlnd_debug.c\
mysqlnd_block_alloc.c mysqlnd_plugin.c
php_mysqlnd.c"
- PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
- PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
- PHP_INSTALL_HEADERS([ext/mysqlnd/])
- dnl Windows uses config.w32 thus this code is safe for now
-
if test "$PHP_MYSQLND_COMPRESSION_SUPPORT" != "no"; then
- if test -z "$PHP_ZLIB_DIR"; then
- AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol
support])
- PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, MYSQLND_SHARED_LIBADD)
- MYSQLND_LIBS="$MYSQLND_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
- fi
+ AC_DEFINE([MYSQLND_COMPRESSION_WANTED], 1, [Enable compressed protocol
support])
fi
AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])
+
+ mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
+ PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, no)
+ PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
+ PHP_INSTALL_HEADERS([ext/mysqlnd/])
fi
if test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2011-03-23 16:37:19 UTC (rev
309608)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.h 2011-03-23 17:14:28 UTC (rev
309609)
@@ -52,6 +52,10 @@
#define MYSQLND_DBG_ENABLED 0
#endif
+#if defined(MYSQLND_COMPRESSION_WANTED) && defined(HAVE_ZLIB)
+#define MYSQLND_COMPRESSION_ENABLED 1
+#endif
+
#ifdef ZTS
#include "TSRM.h"
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
