Changeset 2973


Ignore:
Timestamp:
Oct 28, 2009 6:09:15 AM (9 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:
4 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/aconfigure

    r2970 r2973  
    1149711497                        { echo "$as_me:$LINENO: result: OpenSSL library found, SSL support enabled" >&5 
    1149811498echo "${ECHO_T}OpenSSL library found, SSL support enabled" >&6; } 
    11499                         cat >>confdefs.h <<\_ACEOF 
    11500 #define PJSIP_HAS_TLS_TRANSPORT 1 
    11501 _ACEOF 
    11502  
     11499                        # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK 
     11500                        #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1) 
    1150311501                        cat >>confdefs.h <<\_ACEOF 
    1150411502#define PJ_HAS_SSL_SOCK 1 
  • pjproject/trunk/aconfigure.ac

    r2970 r2973  
    759759                if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then 
    760760                        AC_MSG_RESULT([OpenSSL library found, SSL support enabled]) 
    761                         AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1) 
     761                        # PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK 
     762                        #AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1) 
    762763                        AC_DEFINE(PJ_HAS_SSL_SOCK, 1) 
    763764                else 
  • pjproject/trunk/pjsip/include/pjsip/sip_autoconf.h.in

    r2394 r2973  
    2727 */ 
    2828 
    29 /** 
     29/* 
    3030 * Enable/disable TLS transport, as configured by autoconf. 
    3131 * But only do this if user doesn't explicitly configure in pj/config_site.h. 
    3232 */ 
    33 #ifndef PJSIP_HAS_TLS_TRANSPORT 
    34 #undef PJSIP_HAS_TLS_TRANSPORT 
    35 #endif 
    36  
     33/* Since 1.5, the default setting will follow PJ_HAS_SSL_SOCK setting. */ 
     34//#ifndef PJSIP_HAS_TLS_TRANSPORT 
     35//#undef PJSIP_HAS_TLS_TRANSPORT 
     36//#endif 
    3737 
    3838#endif  /* __PJSIP_SIP_AUTOCONF_H__ */ 
  • pjproject/trunk/pjsip/include/pjsip/sip_config.h

    r2940 r2973  
    514514 * OpenSSL must be installed. 
    515515 * 
    516  * Default: 0 (for now) 
     516 * Default: follow PJ_HAS_SSL_SOCK setting, which is 0 (disabled) by default. 
    517517 */ 
    518518#ifndef PJSIP_HAS_TLS_TRANSPORT 
    519 #   define PJSIP_HAS_TLS_TRANSPORT          0 
     519#   define PJSIP_HAS_TLS_TRANSPORT          PJ_HAS_SSL_SOCK 
    520520#endif 
    521521 
Note: See TracChangeset for help on using the changeset viewer.