Skip to content

Commit 50f1a80

Browse files
authored
PHPC-2280 Prefer OpenSSL on MacOS over Secure Transport (#1463)
1 parent 69f422b commit 50f1a80

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

scripts/autotools/libmongoc/CheckSSL.m4

+16-16
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,6 @@ AS_IF([test "$PHP_MONGODB_SSL" = "yes"],[
1818
PHP_MONGODB_SSL="auto"
1919
])
2020

21-
AS_IF([test "$PHP_MONGODB_SSL" = "darwin" -o \( "$PHP_MONGODB_SSL" = "auto" -a "$os_darwin" = "yes" \)],[
22-
AC_MSG_NOTICE([checking whether Darwin SSL is available])
23-
24-
if test "$os_darwin" = "no"; then
25-
AC_MSG_ERROR([Darwin SSL is only supported on macOS])
26-
fi
27-
dnl PHP_FRAMEWORKS is only used for SAPI builds, so use MONGODB_SHARED_LIBADD for shared builds
28-
if test "$ext_shared" = "yes"; then
29-
MONGODB_SHARED_LIBADD="-framework Security -framework CoreFoundation $MONGODB_SHARED_LIBADD"
30-
else
31-
PHP_ADD_FRAMEWORK([Security])
32-
PHP_ADD_FRAMEWORK([CoreFoundation])
33-
fi
34-
PHP_MONGODB_SSL="darwin"
35-
])
36-
3721
AS_IF([test "$PHP_MONGODB_SSL" = "openssl" -o "$PHP_MONGODB_SSL" = "auto"],[
3822
AC_MSG_NOTICE([checking whether OpenSSL is available])
3923
found_openssl="no"
@@ -132,6 +116,22 @@ AS_IF([test "$PHP_MONGODB_SSL" = "openssl" -o "$PHP_MONGODB_SSL" = "auto"],[
132116
fi
133117
])
134118

119+
AS_IF([test "$PHP_MONGODB_SSL" = "darwin" -o \( "$PHP_MONGODB_SSL" = "auto" -a "$os_darwin" = "yes" \)],[
120+
AC_MSG_NOTICE([checking whether Darwin SSL is available])
121+
122+
if test "$os_darwin" = "no"; then
123+
AC_MSG_ERROR([Darwin SSL is only supported on macOS])
124+
fi
125+
dnl PHP_FRAMEWORKS is only used for SAPI builds, so use MONGODB_SHARED_LIBADD for shared builds
126+
if test "$ext_shared" = "yes"; then
127+
MONGODB_SHARED_LIBADD="-framework Security -framework CoreFoundation $MONGODB_SHARED_LIBADD"
128+
else
129+
PHP_ADD_FRAMEWORK([Security])
130+
PHP_ADD_FRAMEWORK([CoreFoundation])
131+
fi
132+
PHP_MONGODB_SSL="darwin"
133+
])
134+
135135
AS_IF([test "$PHP_MONGODB_SSL" = "libressl" -o "$PHP_MONGODB_SSL" = "auto"],[
136136
AC_MSG_NOTICE([checking whether LibreSSL is available])
137137
found_libressl="no"

0 commit comments

Comments
 (0)