Changeset 6018

Timestamp:

May 31, 2019 5:03:21 AM (5 years ago)

Author:

ming

Message:

Re #2185: Modified the autodetection in configure script to try to compile a sample code instead.

Location:

pjproject/trunk

Files:

• aconfigure (modified) (1 diff)
• aconfigure.ac (modified) (2 diffs)

pjproject/trunk/aconfigure

@@ -7956 +7956 @@
                     SAVED_LIBS="$LIBS"
                     LIBS="-framework Security"
-                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
+#include <Security/SecureTransport.h>
 int
 main ()
 {
-
+if (__builtin_available(macOS 10.3, iOS 11.3, *)) {
+                             SSLContextRef ssl_ctx;
+                             SSLReHandshake(ssl_ctx);
+                         }
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_ssl_backend=darwin
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
                     LIBS="$SAVED_LIBS"
                     if test "x$ac_ssl_backend" = "xdarwin"; then

pjproject/trunk/aconfigure.ac

@@ -1579 +1579 @@
                     SAVED_LIBS="$LIBS"
                     LIBS="-framework Security"
-                    AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [])],
-                                   [ac_ssl_backend=darwin],)
+                    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <Security/SecureTransport.h>]],
+                        [if (__builtin_available(macOS 10.12, iOS 10.0, *)) {
+                             SSLContextRef ssl_ctx;
+                             SSLReHandshake(ssl_ctx);
+                         }])],
+                        [ac_ssl_backend=darwin],)
                     LIBS="$SAVED_LIBS"
                     if test "x$ac_ssl_backend" = "xdarwin"; then
@@ -1586 +1590 @@
                         AC_DEFINE(PJ_SSL_SOCK_IMP, PJ_SSL_SOCK_IMP_DARWIN)
                         LIBS="$LIBS -framework Security"
-                        AC_MSG_RESULT([Checking if Security framework for Darwin SSL is available... yes])
+                        AC_MSG_RESULT([Checking if Darwin SSL is available... yes])
                     else
-                        AC_MSG_RESULT([Checking if Security framework for Darwin SSL is available... no])
+                        AC_MSG_RESULT([Checking if Darwin SSL is available... no])
                     fi
                     ;;