Changeset 2973

Timestamp:

Oct 28, 2009 6:09:15 AM (14 years ago)

Author:

nanang

Message:

Ticket #957: Updated PJSIP_HAS_TLS_TRANSPORT default value to refer to PJ_HAS_SSL_SOCK.

Location:

pjproject/trunk

Files:

• aconfigure (modified) (1 diff)
• aconfigure.ac (modified) (1 diff)
• pjsip/include/pjsip/sip_autoconf.h.in (modified) (1 diff)
• pjsip/include/pjsip/sip_config.h (modified) (1 diff)

pjproject/trunk/aconfigure

@@ -11497 +11497 @@
                         { echo "$as_me:$LINENO: result: OpenSSL library found, SSL support enabled" >&5
 echo "${ECHO_T}OpenSSL library found, SSL support enabled" >&6; }
-                        cat >>confdefs.h <<\_ACEOF
-#define PJSIP_HAS_TLS_TRANSPORT 1
-_ACEOF
-
+                        # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK
+                        #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1)
                         cat >>confdefs.h <<\_ACEOF
 #define PJ_HAS_SSL_SOCK 1

pjproject/trunk/aconfigure.ac

@@ -759 +759 @@
                 if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then
                         AC_MSG_RESULT([OpenSSL library found, SSL support enabled])
-                        AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1)
+                        # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK
+                        #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1)
                         AC_DEFINE(PJ_HAS_SSL_SOCK, 1)
                 else

pjproject/trunk/pjsip/include/pjsip/sip_autoconf.h.in

@@ -27 +27 @@
  */
 
-/**
+/*
  * Enable/disable TLS transport, as configured by autoconf.
  * But only do this if user doesn't explicitly configure in pj/config_site.h.
  */
-#ifndef PJSIP_HAS_TLS_TRANSPORT
-#undef PJSIP_HAS_TLS_TRANSPORT
-#endif
-
+/* Since 1.5, the default setting will follow PJ_HAS_SSL_SOCK setting. */
+//#ifndef PJSIP_HAS_TLS_TRANSPORT
+//#undef PJSIP_HAS_TLS_TRANSPORT
+//#endif
 
 #endif  /* __PJSIP_SIP_AUTOCONF_H__ */

pjproject/trunk/pjsip/include/pjsip/sip_config.h

@@ -514 +514 @@
  * OpenSSL must be installed.
  *
- * Default: 0 (for now)
+ * Default: follow PJ_HAS_SSL_SOCK setting, which is 0 (disabled) by default.
  */
 #ifndef PJSIP_HAS_TLS_TRANSPORT
-#   define PJSIP_HAS_TLS_TRANSPORT          0
+#   define PJSIP_HAS_TLS_TRANSPORT          PJ_HAS_SSL_SOCK
 #endif