diff options
| author | Andrey Hristov <andrey@php.net> | 2011-03-23 17:14:28 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2011-03-23 17:14:28 +0000 |
| commit | e7a5fb405e6a2cf471cbed17fbbfda0768b3fc3a (patch) | |
| tree | bdef6a0ad408fcafc193e98b4a346f83cc7ace31 /ext/mysqlnd/config9.m4 | |
| parent | 72d740f8fa41c13ba4bbe5bdfcf747e98fcd7e35 (diff) | |
| download | php-git-e7a5fb405e6a2cf471cbed17fbbfda0768b3fc3a.tar.gz | |
Fix compressed build, make it easier
Diffstat (limited to 'ext/mysqlnd/config9.m4')
| -rw-r--r-- | ext/mysqlnd/config9.m4 | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4 index 75589ac744..58ca3ebcf8 100644 --- a/ext/mysqlnd/config9.m4 +++ b/ext/mysqlnd/config9.m4 @@ -3,9 +3,9 @@ dnl $Id$ 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 @@ fi 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 |