From 4e7158060256751788b07b19c7a87e652eb39f13 Mon Sep 17 00:00:00 2001
From: Nanang Izzuddin <nanang@teluu.com>
Date: Wed, 28 Oct 2009 06:09:15 +0000
Subject: Ticket #957: Updated PJSIP_HAS_TLS_TRANSPORT default value to refer
 to PJ_HAS_SSL_SOCK.

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2973 74dad513-b988-da41-8d7b-12977e46ad98
---
 aconfigure                            |  6 ++----
 aconfigure.ac                         |  3 ++-
 pjsip/include/pjsip/sip_autoconf.h.in | 10 +++++-----
 pjsip/include/pjsip/sip_config.h      |  4 ++--
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/aconfigure b/aconfigure
index 39fae4bf..3ae02b02 100755
--- a/aconfigure
+++ b/aconfigure
@@ -11496,10 +11496,8 @@ fi
 		if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then
 	        	{ 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
 _ACEOF
diff --git a/aconfigure.ac b/aconfigure.ac
index 7c914907..7f579e7f 100644
--- a/aconfigure.ac
+++ b/aconfigure.ac
@@ -758,7 +758,8 @@ AC_ARG_ENABLE(ssl,
 		AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="$LIBS -lcrypto"])
 		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
 			AC_MSG_RESULT([** OpenSSL libraries not found, disabling SSL support **])
diff --git a/pjsip/include/pjsip/sip_autoconf.h.in b/pjsip/include/pjsip/sip_autoconf.h.in
index 5372b2c3..38eda08d 100644
--- a/pjsip/include/pjsip/sip_autoconf.h.in
+++ b/pjsip/include/pjsip/sip_autoconf.h.in
@@ -26,14 +26,14 @@
  *        autoconf)
  */
 
-/**
+/*
  * 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__ */
 
diff --git a/pjsip/include/pjsip/sip_config.h b/pjsip/include/pjsip/sip_config.h
index 5bbe420f..8dc4a82e 100644
--- a/pjsip/include/pjsip/sip_config.h
+++ b/pjsip/include/pjsip/sip_config.h
@@ -513,10 +513,10 @@ PJ_INLINE(pjsip_cfg_t*) pjsip_cfg(void)
  * Enable TLS SIP transport support. For most systems this means that
  * 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
 
 
-- 
cgit v1.2.3