Fix compressed build, make it easier

diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4
index 75589ac7444213e2f65773c42676e3a9f29028c3..58ca3ebcf860112fa919de20d2f0a78fbd083b3a 100644 (file)
--- 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

diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h
index 4f5aaba0f8e3daf8d80bec2c73b002da401cbf1a..d298855b2b0a6c7cf5e8be9c962463b740a3b00c 100644 (file)
--- a/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@@ -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