Merge pull request #738

Author: jmikola

config.m4

@@ -292,6 +292,9 @@ if test "$MONGODB" != "no"; then
     dnl Generated with: find src/libmongoc/src/mongoc -name '*.c' -print0 | cut -sz -d / -f 5- | sort -z | tr '\000' ' '
     PHP_MONGODB_MONGOC_SOURCES="mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-b64.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-change-stream.c mongoc-client.c mongoc-client-pool.c mongoc-client-session.c mongoc-cluster.c mongoc-cluster-cyrus.c mongoc-cluster-gssapi.c mongoc-cluster-sasl.c mongoc-cluster-sspi.c mongoc-cmd.c mongoc-collection.c mongoc-compression.c mongoc-counters.c mongoc-crypto.c mongoc-crypto-cng.c mongoc-crypto-common-crypto.c mongoc-crypto-openssl.c mongoc-cursor-array.c mongoc-cursor.c mongoc-cursor-cursorid.c mongoc-cursor-transform.c mongoc-cyrus.c mongoc-database.c mongoc-find-and-modify.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-list.c mongoc-gridfs-file-page.c mongoc-gssapi.c mongoc-handshake.c mongoc-host-list.c mongoc-index.c mongoc-init.c mongoc-libressl.c mongoc-linux-distro-scanner.c mongoc-list.c mongoc-log.c mongoc-matcher.c mongoc-matcher-op.c mongoc-memcmp.c mongoc-openssl.c mongoc-queue.c mongoc-rand-cng.c mongoc-rand-common-crypto.c mongoc-rand-openssl.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-sasl.c mongoc-scram.c mongoc-secure-channel.c mongoc-secure-transport.c mongoc-server-description.c mongoc-server-stream.c mongoc-set.c mongoc-socket.c mongoc-ssl.c mongoc-sspi.c mongoc-stream-buffered.c mongoc-stream.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-socket.c mongoc-stream-tls.c mongoc-stream-tls-libressl.c mongoc-stream-tls-openssl-bio.c mongoc-stream-tls-openssl.c mongoc-stream-tls-secure-channel.c mongoc-stream-tls-secure-transport.c mongoc-topology.c mongoc-topology-description-apm.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-command-legacy.c mongoc-write-concern.c"
 
+    dnl Generated with: find src/libmongoc/src/zlib-1.2.11 -maxdepth 1 -name '*.c' -print0 | cut -sz -d / -f 5- | sort -z | tr '\000' ' '
+    PHP_MONGODB_ZLIB_SOURCES="adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c"
+
     PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $PHP_MONGODB_MONGOC_SOURCES, $PHP_MONGODB_MONGOC_CFLAGS, shared_objects_mongodb, yes)
 
     AC_SUBST(MONGOC_ENABLE_CRYPTO, 0)
@@ -329,9 +332,21 @@ if test "$MONGODB" != "no"; then
 
     AC_CHECK_TYPE([socklen_t], [AC_SUBST(MONGOC_HAVE_SOCKLEN, 1)], [AC_SUBST(MONGOC_HAVE_SOCKLEN, 0)], [#include <sys/socket.h>])
 
-    AC_SUBST(MONGOC_ENABLE_COMPRESSION_SNAPPY, 0)
-    AC_SUBST(MONGOC_ENABLE_COMPRESSION_ZLIB, 0)
-    AC_SUBST(MONGOC_ENABLE_COMPRESSION, 0)
+    with_snappy=auto
+    with_zlib=auto
+    m4_include(src/libmongoc/build/autotools/m4/pkg.m4)
+    m4_include(src/libmongoc/build/autotools/CheckSnappy.m4)
+    m4_include(src/libmongoc/build/autotools/CheckZlib.m4)
+
+    if test "x$with_zlib" != "xno" -o "x$with_snappy" != "xno"; then
+      AC_SUBST(MONGOC_ENABLE_COMPRESSION, 1)
+    else
+      AC_SUBST(MONGOC_ENABLE_COMPRESSION, 0)
+    fi
+
+    if test "x$with_zlib" = "xbundled"; then
+      PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/zlib-1.2.11], $PHP_MONGODB_ZLIB_SOURCES, $PHP_MONGODB_MONGOC_CFLAGS, shared_objects_mongodb, yes)
+    fi
   fi
 
 
@@ -389,18 +404,6 @@ if test "$MONGODB" != "no"; then
   enable_srv=auto
   m4_include(src/libmongoc/build/autotools/FindResSearch.m4)
 
-  with_snappy=auto
-  with_zlib=auto
-  m4_include(src/libmongoc/build/autotools/m4/pkg.m4)
-  m4_include(src/libmongoc/build/autotools/CheckSnappy.m4)
-  m4_include(src/libmongoc/build/autotools/CheckZlib.m4)
-
-  if test "x$with_zlib" != "xno" -o "x$with_snappy" != "xno"; then
-     AC_SUBST(MONGOC_ENABLE_COMPRESSION, 1)
-  else
-     AC_SUBST(MONGOC_ENABLE_COMPRESSION, 0)
-  fi
-
   m4_include(src/libmongoc/build/autotools/WeakSymbols.m4)
   m4_include(src/libmongoc/build/autotools/m4/ax_pthread.m4)
   AX_PTHREAD
@@ -434,6 +437,10 @@ if test "$MONGODB" != "no"; then
   if test "$PHP_LIBMONGOC" == "no"; then
     PHP_ADD_INCLUDE([$ext_srcdir/src/libmongoc/src/mongoc/])
     PHP_ADD_BUILD_DIR([$ext_builddir/src/libmongoc/src/mongoc/])
+    if test "x$with_zlib" = "xbundled"; then
+      PHP_ADD_INCLUDE([$ext_srcdir/src/libmongoc/src/zlib-1.2.11/])
+      PHP_ADD_BUILD_DIR([$ext_srcdir/src/libmongoc/src/zlib-1.2.11/])
+    fi
   fi
   if test "$PHP_LIBBSON" == "no"; then
     m4_include(src/libbson/build/autotools/CheckAtomics.m4)
@@ -491,6 +498,9 @@ if test "$MONGODB" != "no"; then
     AC_SUBST(MONGOC_VERSION)
     AC_OUTPUT($srcdir/src/libmongoc/src/mongoc/mongoc-config.h)
     AC_OUTPUT($srcdir/src/libmongoc/src/mongoc/mongoc-version.h)
+    if test "x$with_zlib" = "xbundled"; then
+      AC_OUTPUT($srcdir/src/libmongoc/src/zlib-1.2.11/zconf.h)
+    fi
   fi
   if test "$PHP_LIBBSON" == "no"; then
     backup_srcdir=${srcdir}