sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re #2210 (misc): Disable Darwin SSL if deprecated 

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@6145 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Sauw Ming 2020-01-29 04:45:27 +00:00
parent c5e970e850
commit 187524186f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
aconfigure
View File

@ -8045,6 +8045,8 @@ else
case $target in
*darwin*)
SAVED_CFLAGS="$CFLAGS"
CFLAGS="-Werror"
SAVED_LIBS="$LIBS"
LIBS="-framework Security"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@ -8065,6 +8067,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
ac_ssl_backend=darwin
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$SAVED_CFLAGS"
LIBS="$SAVED_LIBS"
if test "x$ac_ssl_backend" = "xdarwin"; then
$as_echo "#define PJ_HAS_SSL_SOCK 1" >>confdefs.h
@ -9023,7 +9026,7 @@ $as_echo "Checking if libwebrtc is disabled...no" >&6; }
ac_webrtc_instset=mips
;;
x86*)
ac_webrtc_instset=sse2
ac_webrtc_instset=sse2
;;
*)
ac_webrtc_instset=generic

3
aconfigure.ac
View File

@ -1641,6 +1641,8 @@ AC_ARG_ENABLE(darwin-ssl,
[
case $target in
*darwin*)
SAVED_CFLAGS="$CFLAGS"
CFLAGS="-Werror"
SAVED_LIBS="$LIBS"
LIBS="-framework Security"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <Security/SecureTransport.h>]],
@ -1649,6 +1651,7 @@ AC_ARG_ENABLE(darwin-ssl,
SSLReHandshake(ssl_ctx);
}])],
[ac_ssl_backend=darwin],)
CFLAGS="$SAVED_CFLAGS"
LIBS="$SAVED_LIBS"
if test "x$ac_ssl_backend" = "xdarwin"; then
AC_DEFINE(PJ_HAS_SSL_SOCK, 1)