Merged pull request #849

Author: derickr

config.m4

@@ -265,6 +265,7 @@ if test "$PHP_MONGODB" != "no"; then
     _include([scripts/autotools/libmongoc/CheckResolv.m4])
     _include([scripts/autotools/libmongoc/CheckSasl.m4])
     _include([scripts/autotools/libmongoc/CheckSSL.m4])
+    _include([scripts/autotools/libmongoc/CheckICU.m4])
     _include([scripts/autotools/libmongoc/FindDependencies.m4])
     _include([scripts/autotools/libmongoc/PlatformFlags.m4])
     _include([scripts/autotools/libmongoc/Versions.m4])

config.w32

@@ -154,6 +154,7 @@ if (PHP_MONGODB != "no") {
     MONGOC_ENABLE_SASL_CYRUS: 0,
     MONGOC_ENABLE_SASL_GSSAPI: 0,
     MONGOC_ENABLE_SASL_SSPI: 0,
+    MONGOC_ENABLE_ICU: 0,
     MONGOC_ENABLE_RDTSCP: 0,
     MONGOC_ENABLE_SHM_COUNTERS: 0,
     MONGOC_HAVE_ASN1_STRING_GET0_DATA: 0,
@@ -225,6 +226,23 @@ if (PHP_MONGODB != "no") {
     mongoc_opts.MONGOC_HAVE_DNSAPI = 1;
   }
 
+  if (CHECK_LIB("icuuc.lib", "mongodb", PHP_MONGODB) &&
+      CHECK_HEADER_ADD_INCLUDE("unicode/utf.h", "CFLAGS_MONGODB")) {
+    mongoc_opts.MONGODB_ENABLE_ICU = 1;
+
+    ADD_FLAG("LIBS_MONGODB", "icudt.lib icuin.lib icuio.lib");
+
+    /* Compat for ICU before 58.1.*/
+    if (CHECK_LIB("icule.lib", "mongodb", PHP_MONGODB)) {
+      ADD_FLAG("LIBS_MONGODB", "icule.lib");
+    }
+    if (CHECK_LIB("iculx.lib", "mongodb", PHP_MONGODB)) {
+      ADD_FLAG("LIBS_MONGODB", "iculx.lib");
+    }
+
+    ADD_FLAG("CFLAGS_MONGODB", "/EHsc /D U_USING_ICU_NAMESPACE=1");
+  }
+
   if (typeof COMPILER_NAME === 'string') {
     mongoc_opts.MONGOC_CC = COMPILER_NAME;
   } else if (typeof VC_VERSIONS[VCVERS] === 'string') {

php_phongo.c

@@ -3034,6 +3034,12 @@ PHP_MINFO_FUNCTION(mongodb)
 	php_info_print_table_row(2, "libmongoc SASL", "disabled");
 #endif
 
+#ifdef MONGOC_ENABLE_ICU
+	php_info_print_table_row(2, "libmongoc ICU", "enabled");
+#else
+	php_info_print_table_row(2, "libmongoc ICU", "disabled");
+#endif
+
 #ifdef MONGOC_ENABLE_COMPRESSION
 	php_info_print_table_row(2, "libmongoc compression", "enabled");
 #ifdef MONGOC_ENABLE_COMPRESSION_SNAPPY

scripts/autotools/libmongoc/CheckICU.m4

@@ -0,0 +1,37 @@
+PHP_ARG_WITH([mongodb-icu],
+             [whether to enable ICU for SASLPrep with SCRAM-SHA-256 authentication],
+             [AS_HELP_STRING([--with-mongodb-icu=@<:@auto/yes/no@:>@],
+                             [MongoDB: Enable ICU for SASLPrep with SCRAM-SHA-256 authentication [default=auto]])],
+             [auto],
+             [no])
+
+AS_IF([test "$PHP_MONGODB_ICU" = "auto" -o "$PHP_MONGODB_ICU" = "yes"],[
+  found_icu=no
+
+  PKG_CHECK_MODULES([PHP_MONGODB_ICU],[icu-uc],[
+    PHP_MONGODB_BUNDLED_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS $PHP_MONGODB_ICU_CFLAGS"
+    PHP_EVAL_LIBLINE([$PHP_MONGODB_ICU_LIBS],[MONGODB_SHARED_LIBADD])
+    PHP_MONGODB_ICU="yes"
+    found_icu=yes
+  ],[
+    found_icu=no
+  ])
+
+  if test "$PHP_MONGODB_ICU" = "yes" -a "$found_icu" = "no"; then
+    AC_MSG_ERROR([ICU libraries and development headers could not be found])
+  fi
+])
+
+AS_IF([test "$PHP_MONGODB_ICU" = "auto"],[
+  PHP_MONGODB_ICU="no"
+])
+
+if test ! \( "$PHP_MONGODB_ICU" = "yes" -o "$PHP_MONGODB_ICU" = "no" \); then
+  AC_MSG_WARN([unsupported --with-mongodb-icu value: $PHP_MONGODB_ICU])
+fi
+
+if test "$PHP_MONGODB_ICU" = "yes"; then
+  AC_SUBST(MONGOC_ENABLE_ICU, 1)
+else
+  AC_SUBST(MONGOC_ENABLE_ICU, 0)
+fi