Changeset 5957 for pjproject/trunk/aconfigure.ac

Timestamp:

Mar 25, 2019 1:33:12 AM (5 years ago)

Author:

ming

Message:

Fixed #2185: Darwin (Mac OS & iOS) native SSL backend

File:

• pjproject/trunk/aconfigure.ac (modified) (3 diffs)

pjproject/trunk/aconfigure.ac

@@ -1542 +1542 @@
 dnl # SSL alt prefix
 AC_ARG_WITH(ssl,
-    AS_HELP_STRING([--with-ssl=DIR],
-                   [Specify alternate SSL library prefix. This option will try
-                    to find OpenSSL first, then if not found, GnuTLS. To skip
-                    OpenSSL finding, use --with-gnutls option instead.]),
+    AS_HELP_STRING([--with-ssl=SSL_BACKEND/DIR],
+                   [Specify alternate SSL library prefix or SSL native-backend.
+                    You can specify "darwin" as the native iOS/MacOS backend
+                    using Security framework, or you can specify an alternate
+                    SSL library prefix directory. If a directory
+                    is specified, this option will try to find OpenSSL first,
+                    then if not found, GnuTLS. To skip OpenSSL finding, use
+                    --with-gnutls option instead.]),
     [],
     [with_ssl=no]
@@ -1578 +1582 @@
               ],
               [
-                if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
+                if test "x$with_ssl" = "xdarwin"; then
+                    SAVED_LIBS="$LIBS"
+                    LIBS="-framework Security"
+                    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [])],
+                                   [ac_ssl_backend=darwin],)
+                    LIBS="$SAVED_LIBS"
+                    if test "x$ac_ssl_backend" = "xdarwin"; then
+                        AC_DEFINE(PJ_HAS_SSL_SOCK, 1)
+                        AC_DEFINE(PJ_SSL_SOCK_IMP, PJ_SSL_SOCK_IMP_DARWIN)
+                        LIBS="$LIBS -framework Security"
+                        ac_ssl_backend="darwin"
+                        AC_MSG_RESULT([Checking if Security framework for Darwin SSL is available... yes])
+                    else
+                        AC_MSG_RESULT([Checking if Security framework for Darwin SSL is available... no])
+                    fi
+                fi
+                
+                if test "x$ac_ssl_backend" = "x" -a "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
                     CFLAGS="$CFLAGS -I$with_ssl/include"
                     CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
@@ -1585 +1606 @@
                 fi
 
-                if test "x$with_gnutls" = "xno"; then
+                if test "x$ac_ssl_backend" = "x" -a "x$with_gnutls" = "xno"; then
 
                     AC_MSG_RESULT([checking for OpenSSL installations..])