PHPC-2625: Set values for C++ compiler in configure scripts

Author: alcaeus

config.m4

@@ -398,6 +398,7 @@ if test "$PHP_MONGODB" != "no"; then
       ${ac_config_dir}/src/libmongoc/src/libbson/src/bson/config.h
       ${ac_config_dir}/src/libmongoc/src/libbson/src/bson/version.h
       ${ac_config_dir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config.h
+      ${ac_config_dir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config-private.h
       ${ac_config_dir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-version.h
     ])
 

config.w32

@@ -194,7 +194,9 @@ if (PHP_MONGODB != "no") {
     MONGOC_HAVE_SS_FAMILY: 0,
     MONGOC_CC: "",
     MONGOC_USER_SET_CFLAGS: "",
-    MONGOC_USER_SET_LDFLAGS: ""
+    MONGOC_USER_SET_LDFLAGS: "",
+    MONGOC_CXX_COMPILER_ID: "",
+    MONGOC_CXX_COMPILER_VERSION: ""
   };
 
   var mongoc_ssl_path_to_check = PHP_MONGODB;
@@ -335,6 +337,12 @@ if (PHP_MONGODB != "no") {
     mongoc_opts
   );
 
+  mongodb_generate_header(
+    configure_module_dirname + "/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config-private.h.in",
+    configure_module_dirname + "/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config-private.h",
+    mongoc_opts
+  );
+
   mongodb_generate_header(
     configure_module_dirname + "/src/libmongoc/src/common/src/common-config.h.in",
     configure_module_dirname + "/src/libmongoc/src/common/src/common-config.h",

scripts/autotools/libmongoc/Versions.m4

@@ -12,3 +12,5 @@ AC_SUBST(libmongoc_VERSION_MAJOR)
 AC_SUBST(libmongoc_VERSION_MINOR)
 AC_SUBST(libmongoc_VERSION_PATCH)
 AC_SUBST(libmongoc_VERSION_PRERELEASE)
+AC_SUBST(MONGOC_CXX_COMPILER_ID, "")
+AC_SUBST(MONGOC_CXX_COMPILER_VERSION, "")