Merge branch 'v1.8'

Author: jmikola

php_phongo.c

@@ -3730,6 +3730,11 @@ PHP_MINFO_FUNCTION(mongodb)
 #else
 	php_info_print_table_row(2, "libmongoc compression zlib", "disabled");
 #endif
+#ifdef MONGOC_ENABLE_COMPRESSION_ZSTD
+	php_info_print_table_row(2, "libmongoc compression zstd", "enabled");
+#else
+	php_info_print_table_row(2, "libmongoc compression zstd", "disabled");
+#endif
 #else /* MONGOC_ENABLE_COMPRESSION */
 	php_info_print_table_row(2, "libmongoc compression", "disabled");
 #endif

scripts/autotools/libmongoc/CheckCompression.m4

@@ -1,6 +1,7 @@
 found_snappy="no"
 found_zlib="no"
 bundled_zlib="no"
+found_zstd="no"
 
 PKG_CHECK_MODULES([PHP_MONGODB_SNAPPY],[snappy],[
   PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS $PHP_MONGODB_SNAPPY_CFLAGS"
@@ -47,7 +48,27 @@ AS_IF([test "$found_zlib" != "yes"],[
   bundled_zlib="yes"
 ])
 
-if test "$found_snappy" = "yes" -o "$found_zlib" = "yes" -o "$bundled_zlib" = "yes"; then
+PKG_CHECK_MODULES([PHP_MONGODB_ZSTD],[libzstd],[
+  PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS $PHP_MONGODB_ZSTD_CFLAGS"
+  PHP_EVAL_LIBLINE([$PHP_MONGODB_ZSTD_LIBS],[MONGODB_SHARED_LIBADD])
+  found_zstd="yes"
+],[
+  PHP_CHECK_LIBRARY([zstd],
+                    [ZSTD_compress],
+                    [have_zstd_lib="yes"],
+                    [have_zstd_lib="no"])
+
+  AC_CHECK_HEADER([zstd.h],
+                  [have_zstd_headers=yes],
+                  [have_zstd_headers=no])
+
+  if test "$have_zstd_lib" = "yes" -a "$have_zstd_headers" = "yes"; then
+    PHP_ADD_LIBRARY([zstd],,[MONGODB_SHARED_LIBADD])
+    found_zstd="yes"
+  fi
+])
+
+if test "$found_snappy" = "yes" -o "$found_zlib" = "yes" -o "$bundled_zlib" = "yes" -o "$found_zstd" = "yes"; then
   AC_SUBST(MONGOC_ENABLE_COMPRESSION, 1)
   if test "$found_snappy" = "yes"; then
     AC_SUBST(MONGOC_ENABLE_COMPRESSION_SNAPPY, 1)
@@ -59,10 +80,14 @@ if test "$found_snappy" = "yes" -o "$found_zlib" = "yes" -o "$bundled_zlib" = "y
   else
     AC_SUBST(MONGOC_ENABLE_COMPRESSION_ZLIB, 0)
   fi
+  if test "$found_zstd" = "yes"; then
+    AC_SUBST(MONGOC_ENABLE_COMPRESSION_ZSTD, 1)
+  else
+    AC_SUBST(MONGOC_ENABLE_COMPRESSION_ZSTD, 0)
+  fi
 else
   AC_SUBST(MONGOC_ENABLE_COMPRESSION, 0)
-  AC_SUBST(MONGOC_ENABLE_COMPRESSION_ZLIB, 0)
   AC_SUBST(MONGOC_ENABLE_COMPRESSION_SNAPPY, 0)
+  AC_SUBST(MONGOC_ENABLE_COMPRESSION_ZLIB, 0)
+  AC_SUBST(MONGOC_ENABLE_COMPRESSION_ZSTD, 0)
 fi
-
-AC_SUBST(MONGOC_ENABLE_COMPRESSION_ZSTD, 0)