Changeset 5959 for pjproject/trunk/aconfigure.ac

Timestamp:

Mar 26, 2019 7:25:57 AM (5 years ago)

Author:

ming

Message:

Re #2185: Darwin SSL backend

• Security framework availability will be automatically detected for Mac OS and iOS, and if found, Darwin SSL will be the default SSL backend.
• OpenSSL availability will still be checked regardless of the above result, as it may be needed for DTLS.
• Add configure option --disable-darwin-ssl to disable the automatic detection

File:

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

pjproject/trunk/aconfigure.ac

@@ -1542 +1542 @@
 dnl # SSL alt prefix
 AC_ARG_WITH(ssl,
-    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.]),
+    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.]),
     [],
     [with_ssl=no]
@@ -1571 +1567 @@
 AC_SUBST(ac_ssl_has_aes_gcm,0)
 AC_SUBST(ac_ssl_backend)
-AC_ARG_ENABLE(ssl,
-              AS_HELP_STRING([--disable-ssl],
-                             [Exclude SSL support the build (default: autodetect)])
-              ,
-              [
-                if test "$enable_ssl" = "no"; then
-                 [ac_no_ssl=1]
-                 AC_MSG_RESULT([Checking if SSL support is disabled... yes])
-                fi
-              ],
-              [
-                if test "x$with_ssl" = "xdarwin"; then
+
+AC_ARG_ENABLE(darwin-ssl,
+              AS_HELP_STRING([--disable-darwin-ssl],
+                             [Exclude Darwin SSL (default: autodetect)]),
+              [if test "$enable_darwin_ssl" = "no"; then
+                 AC_MSG_RESULT([Checking if Darwin SSL support is disabled... yes])
+                fi],
+              [
+                case $target in
+                *darwin*)
                     SAVED_LIBS="$LIBS"
                     LIBS="-framework Security"
@@ -1592 +1586 @@
                         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
+                    ;;
+                esac
+              ])
+
+AC_ARG_ENABLE(ssl,
+              AS_HELP_STRING([--disable-ssl],
+                             [Exclude SSL support the build (default: autodetect)])
+              ,
+              [
+                if test "$enable_ssl" = "no"; then
+                 [ac_no_ssl=1]
+                 AC_MSG_RESULT([Checking if SSL support is disabled... yes])
+                fi
+              ],
+              [
+                if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
                     CFLAGS="$CFLAGS -I$with_ssl/include"
                     CPPFLAGS="$CPPFLAGS -I$with_ssl/include"
@@ -1606 +1612 @@
                 fi
 
-                if test "x$ac_ssl_backend" = "x" -a "x$with_gnutls" = "xno"; then
-
+                if test "x$with_gnutls" = "xno"; then
+                    # We still need to check for OpenSSL installations even if
+                    # we find Darwin SSL above since DTLS requires OpenSSL.
                     AC_MSG_RESULT([checking for OpenSSL installations..])
                     AC_SUBST(openssl_h_present)
@@ -1633 +1640 @@
                         fi
 
-                        # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK
-                        #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1)
-                        AC_DEFINE(PJ_HAS_SSL_SOCK, 1)
-                        AC_DEFINE(PJ_SSL_SOCK_IMP, PJ_SSL_SOCK_IMP_OPENSSL)
-                        ac_ssl_backend="openssl"
+                        if test "x$ac_ssl_backend" = "x"; then
+                            # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK
+                            #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1)
+                            AC_DEFINE(PJ_HAS_SSL_SOCK, 1)
+                            AC_DEFINE(PJ_SSL_SOCK_IMP, PJ_SSL_SOCK_IMP_OPENSSL)
+                            ac_ssl_backend="openssl"
+                        fi
                     else
                         AC_MSG_RESULT([** OpenSSL libraries not found **])