Merge pull request #1098

Author: alcaeus

.evergreen/config.yml

@@ -680,10 +680,11 @@ axes:
   - id: libmongoc-version
     display_name: libmongoc version
     values:
-      - id: "1.16-latest"
-        display_name: "1.16 latest"
-        variables:
-          LIBMONGOC_VERSION: "r1.16"
+# Todo: re-enable once 1.17 is branched
+#      - id: "1.17-latest"
+#        display_name: "1.17 latest"
+#        variables:
+#          LIBMONGOC_VERSION: "r1.17"
       - id: "master"
         display_name: "Upcoming release (master)"
         variables:

config.m4

@@ -220,13 +220,13 @@ if test "$PHP_MONGODB" != "no"; then
     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
     AC_MSG_CHECKING(for libbson)
     if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libbson-1.0; then
-      if $PKG_CONFIG libbson-1.0 --atleast-version 1.16.1; then
+      if $PKG_CONFIG libbson-1.0 --atleast-version 1.17.0; then
         PHP_MONGODB_BSON_CFLAGS=`$PKG_CONFIG libbson-1.0 --cflags`
         PHP_MONGODB_BSON_LIBS=`$PKG_CONFIG libbson-1.0 --libs`
         PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
         AC_MSG_RESULT(version $PHP_MONGODB_BSON_VERSION found)
       else
-        AC_MSG_ERROR(system libbson must be upgraded to version >= 1.16.1)
+        AC_MSG_ERROR(system libbson must be upgraded to version >= 1.17.0)
       fi
     else
       AC_MSG_ERROR(pkgconfig and libbson must be installed)
@@ -237,13 +237,13 @@ if test "$PHP_MONGODB" != "no"; then
 
     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
+      if $PKG_CONFIG libmongoc-1.0 --atleast-version 1.17.0; then
         PHP_MONGODB_MONGOC_CFLAGS=`$PKG_CONFIG libmongoc-1.0 --cflags`
         PHP_MONGODB_MONGOC_LIBS=`$PKG_CONFIG libmongoc-1.0 --libs`
         PHP_MONGODB_MONGOC_VERSION=`$PKG_CONFIG libmongoc-1.0 --modversion`
         AC_MSG_RESULT(version $PHP_MONGODB_MONGOC_VERSION found)
       else
-        AC_MSG_ERROR(system libmongoc must be upgraded to version >= 1.16.1)
+        AC_MSG_ERROR(system libmongoc must be upgraded to version >= 1.17.0)
       fi
     else
       AC_MSG_ERROR(pkgconfig and libmongoc must be installed)

src/LIBMONGOC_VERSION_CURRENT

@@ -1 +1 @@
-1.16.1
+1.17.0-20200207+git7e801593f2