PHPC-703: Update configure scripts for new SSL defines

This covers changes from CDRIVER-1156.

Author: jmikola

config.m4

@@ -394,15 +394,15 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
     PHP_SETUP_OPENSSL(MONGODB_SHARED_LIBADD)
     AC_SUBST(MONGOC_ENABLE_CRYPTO, 1)
     AC_SUBST(MONGOC_ENABLE_SSL, 1)
-    AC_SUBST(MONGOC_ENABLE_LIBCRYPTO, 1)
-    AC_SUBST(MONGOC_ENABLE_OPENSSL, 1)
+    AC_SUBST(MONGOC_ENABLE_CRYPTO_LIBCRYPTO, 1)
+    AC_SUBST(MONGOC_ENABLE_SSL_OPENSSL, 1)
 
     dnl TODO: Support building with Secure Transport on OSX
-    AC_SUBST(MONGOC_ENABLE_SECURE_TRANSPORT, 0)
-    AC_SUBST(MONGOC_ENABLE_COMMON_CRYPTO, 0)
+    AC_SUBST(MONGOC_ENABLE_SSL_SECURE_TRANSPORT, 0)
+    AC_SUBST(MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO, 0)
 
     dnl Secure Channel only applies to Windows
-    AC_SUBST(MONGOC_ENABLE_SECURE_CHANNEL, 0)
+    AC_SUBST(MONGOC_ENABLE_SSL_SECURE_CHANNEL, 0)
     AC_SUBST(MONGOC_ENABLE_CRYPTO_CNG, 0)
 
     AC_SUBST(MONGOC_NO_AUTOMATIC_GLOBALS, 1)

config.w32

@@ -40,24 +40,24 @@ if (PHP_MONGODB != "no") {
   if (CHECK_LIB("ssleay32.lib", "mongodb", PHP_MONGODB) &&
       CHECK_LIB("libeay32.lib", "mongodb", PHP_MONGODB) &&
       CHECK_HEADER_ADD_INCLUDE("openssl/ssl.h", "CFLAGS_MONGOC")) {
-    AC_DEFINE("MONGOC_ENABLE_OPENSSL", 1);
-    AC_DEFINE("MONGOC_ENABLE_LIBCRYPTO", 1);
+    AC_DEFINE("MONGOC_ENABLE_SSL_OPENSSL", 1);
+    AC_DEFINE("MONGOC_ENABLE_CRYPTO_LIBCRYPTO", 1);
     AC_DEFINE("MONGOC_ENABLE_SSL", 1);
     AC_DEFINE("MONGOC_ENABLE_CRYPTO", 1);
   } else {
     WARNING("mongodb libopenssl support not enabled, libs not found");
-    AC_DEFINE("MONGOC_ENABLE_OPENSSL", 0);
-    AC_DEFINE("MONGOC_ENABLE_LIBCRYPTO", 0);
+    AC_DEFINE("MONGOC_ENABLE_SSL_OPENSSL", 0);
+    AC_DEFINE("MONGOC_ENABLE_CRYPTO_LIBCRYPTO", 0);
     AC_DEFINE("MONGOC_ENABLE_SSL", 0);
     AC_DEFINE("MONGOC_ENABLE_CRYPTO", 0);
   }
 
   // Secure Transport does not apply to Windows
-  AC_DEFINE("MONGOC_ENABLE_SECURE_TRANSPORT", 0);
-  AC_DEFINE("MONGOC_ENABLE_COMMON_CRYPTO", 0);
+  AC_DEFINE("MONGOC_ENABLE_SSL_SECURE_TRANSPORT", 0);
+  AC_DEFINE("MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO", 0);
 
   // TODO: Support building with Secure Channel on Windows
-  AC_DEFINE("MONGOC_ENABLE_SECURE_CHANNEL", 0)
+  AC_DEFINE("MONGOC_ENABLE_SSL_SECURE_CHANNEL", 0)
   AC_DEFINE("MONGOC_ENABLE_CRYPTO_CNG", 0)
 
   if (PHP_MONGODB_SASL != "no" &&