Skip to content

Commit 38bed72

Browse files
committed
Apply code review feedback
1 parent b6042ee commit 38bed72

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

config.w32

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,7 @@ if (PHP_MONGODB != "no") {
232232
WARNING("mongodb libopenssl support not enabled, libs not found");
233233
}
234234

235-
if (PHP_MONGODB_SASL != "no" &&
236-
CHECK_LIB("libsasl.lib", "mongodb", PHP_MONGODB) &&
237-
CHECK_HEADER_ADD_INCLUDE("sasl/sasl.h", "CFLAGS_MONGODB")) {
238-
235+
if (PHP_MONGODB_SASL != "no") {
239236
// TODO 3.0: Remove warning on "yes" as it implies "sspi"
240237
if (PHP_MONGODB_SASL == "yes") {
241238
WARNING("Cyrus SASL support for Windows was removed. Falling back to SSPI; use '--with-mongodb-sasl=sspi' to avoid this warning.");
@@ -245,14 +242,12 @@ if (PHP_MONGODB != "no") {
245242
mongoc_opts.MONGOC_ENABLE_SASL = 1;
246243
mongoc_opts.MONGOC_ENABLE_SASL_SSPI = 1;
247244
} else {
248-
WARNING("MongoDB SASL support not enabled, unknown value for PHP_MONGODB_SASL: " + PHP_MONGODB_SASL);
245+
ERROR("MongoDB SASL support not enabled, unknown value for --with-mongodb-sasl: " + PHP_MONGODB_SASL);
249246
}
250247

251248
if (CHECK_FUNC_IN_HEADER("sasl/sasl.h", "sasl_client_done")) {
252249
mongoc_opts.MONGOC_HAVE_SASL_CLIENT_DONE = 1;
253250
}
254-
} else if (PHP_MONGODB_SASL != "no") {
255-
WARNING("mongodb libsasl support not enabled, libs not found");
256251
}
257252

258253
if (PHP_MONGODB_CLIENT_SIDE_ENCRYPTION != "no" && mongoc_ssl_found) {

0 commit comments

Comments
 (0)