Merge branch 'v1.7'

* v1.7:
  Back to -dev
  Package 1.7.1
  Test against PHP 7.4 instead of snapshot
  Cleanup duplicated check
  PHPC-1551: Fix build with system libraries

Author: alcaeus

.travis.yml

@@ -31,7 +31,7 @@ jobs:
     - stage: Test
       php: 7.2
     - stage: Test
-      php: 7.4snapshot
+      php: 7.4
 
     # Test against various server topologies
     - stage: Test

config.m4

@@ -235,7 +235,6 @@ if test "$PHP_MONGODB" != "no"; then
     PHP_EVAL_LIBLINE($PHP_MONGODB_BSON_LIBS, MONGODB_SHARED_LIBADD)
     AC_DEFINE(HAVE_SYSTEM_LIBBSON, 1, [Use system libbson])
 
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
     AC_MSG_CHECKING(for libmongoc)
     if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmongoc-1.0; then
       if $PKG_CONFIG libmongoc-1.0 --atleast-version 1.16.1; then
@@ -254,14 +253,13 @@ if test "$PHP_MONGODB" != "no"; then
     AC_DEFINE(HAVE_SYSTEM_LIBMONGOC, 1, [Use system libmongoc])
 
     if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then
-      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
       AC_MSG_CHECKING(for libmongocrypt)
 
-      if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmongocrypt-1.0; then
-        if $PKG_CONFIG libmongocrypt-1.0 --atleast-version 1.0.1; then
-          PHP_MONGODB_MONGOCRYPT_CFLAGS=`$PKG_CONFIG libmongocrypt-1.0 --cflags`
-          PHP_MONGODB_MONGOCRYPT_LIBS=`$PKG_CONFIG libmongocrypt-1.0 --libs`
-          PHP_MONGODB_MONGOCRYPT_VERSION=`$PKG_CONFIG libmongocrypt-1.0 --modversion`
+      if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmongocrypt; then
+        if $PKG_CONFIG libmongocrypt --atleast-version 1.0.1; then
+          PHP_MONGODB_MONGOCRYPT_CFLAGS=`$PKG_CONFIG libmongocrypt --cflags`
+          PHP_MONGODB_MONGOCRYPT_LIBS=`$PKG_CONFIG libmongocrypt --libs`
+          PHP_MONGODB_MONGOCRYPT_VERSION=`$PKG_CONFIG libmongocrypt --modversion`
           AC_MSG_RESULT(version $PHP_MONGODB_MONGOCRYPT_VERSION found)
 
           PHP_MONGODB_CFLAGS="$PHP_MONGODB_CFLAGS $PHP_MONGODB_MONGOCRYPT_CFLAGS"

php_phongo.c

@@ -3924,7 +3924,7 @@ PHP_MINFO_FUNCTION(mongodb)
 #ifdef MONGOC_ENABLE_CLIENT_SIDE_ENCRYPTION
 #ifdef HAVE_SYSTEM_LIBMONGOCRYPT
 	php_info_print_table_row(2, "libmongocrypt headers version", MONGOCRYPT_VERSION);
-	php_info_print_table_row(2, "libmongocrypt library version", mongocrypt_version());
+	php_info_print_table_row(2, "libmongocrypt library version", mongocrypt_version(NULL));
 #else
 	php_info_print_table_row(2, "libmongocrypt bundled version", MONGOCRYPT_VERSION);
 #endif