From c30fb9487501ca2f217924079f9f84cf7bac585d Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 5 Sep 2023 11:11:53 +0200 Subject: [PATCH] PHPC-2280 Prefer OpenSSL on MacOS over Secure Transport --- scripts/autotools/libmongoc/CheckSSL.m4 | 32 ++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/autotools/libmongoc/CheckSSL.m4 b/scripts/autotools/libmongoc/CheckSSL.m4 index 320b9214e..561918998 100644 --- a/scripts/autotools/libmongoc/CheckSSL.m4 +++ b/scripts/autotools/libmongoc/CheckSSL.m4 @@ -18,22 +18,6 @@ AS_IF([test "$PHP_MONGODB_SSL" = "yes"],[ PHP_MONGODB_SSL="auto" ]) -AS_IF([test "$PHP_MONGODB_SSL" = "darwin" -o \( "$PHP_MONGODB_SSL" = "auto" -a "$os_darwin" = "yes" \)],[ - AC_MSG_NOTICE([checking whether Darwin SSL is available]) - - if test "$os_darwin" = "no"; then - AC_MSG_ERROR([Darwin SSL is only supported on macOS]) - fi - dnl PHP_FRAMEWORKS is only used for SAPI builds, so use MONGODB_SHARED_LIBADD for shared builds - if test "$ext_shared" = "yes"; then - MONGODB_SHARED_LIBADD="-framework Security -framework CoreFoundation $MONGODB_SHARED_LIBADD" - else - PHP_ADD_FRAMEWORK([Security]) - PHP_ADD_FRAMEWORK([CoreFoundation]) - fi - PHP_MONGODB_SSL="darwin" -]) - AS_IF([test "$PHP_MONGODB_SSL" = "openssl" -o "$PHP_MONGODB_SSL" = "auto"],[ AC_MSG_NOTICE([checking whether OpenSSL is available]) found_openssl="no" @@ -132,6 +116,22 @@ AS_IF([test "$PHP_MONGODB_SSL" = "openssl" -o "$PHP_MONGODB_SSL" = "auto"],[ fi ]) +AS_IF([test "$PHP_MONGODB_SSL" = "darwin" -o \( "$PHP_MONGODB_SSL" = "auto" -a "$os_darwin" = "yes" \)],[ + AC_MSG_NOTICE([checking whether Darwin SSL is available]) + + if test "$os_darwin" = "no"; then + AC_MSG_ERROR([Darwin SSL is only supported on macOS]) + fi + dnl PHP_FRAMEWORKS is only used for SAPI builds, so use MONGODB_SHARED_LIBADD for shared builds + if test "$ext_shared" = "yes"; then + MONGODB_SHARED_LIBADD="-framework Security -framework CoreFoundation $MONGODB_SHARED_LIBADD" + else + PHP_ADD_FRAMEWORK([Security]) + PHP_ADD_FRAMEWORK([CoreFoundation]) + fi + PHP_MONGODB_SSL="darwin" +]) + AS_IF([test "$PHP_MONGODB_SSL" = "libressl" -o "$PHP_MONGODB_SSL" = "auto"],[ AC_MSG_NOTICE([checking whether LibreSSL is available]) found_libressl="no"