Build with mbedtls instead of polarssl by default.

builders/bctoolbox.cmake

@@ -29,9 +29,9 @@ set(EP_bctoolbox_GROUPABLE YES)
 set(EP_bctoolbox_LINKING_TYPE ${DEFAULT_VALUE_CMAKE_LINKING_TYPE})
 set(EP_bctoolbox_DEPENDENCIES )
 if(LINPHONE_BUILDER_BUILD_DEPENDENCIES)
-	if (ENABLE_MBEDTLS)
+	if(ENABLE_MBEDTLS)
 		list(APPEND EP_bctoolbox_DEPENDENCIES EP_mbedtls)
-	elseif (ENABLE_POLARSSL)
+	elseif(ENABLE_POLARSSL)
 		list(APPEND EP_bctoolbox_DEPENDENCIES EP_polarssl)
 	endif()
 endif()

configs/config-android.cmake

@@ -27,6 +27,7 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
 set(DEFAULT_VALUE_ENABLE_ILBC ON)
 set(DEFAULT_VALUE_ENABLE_ISAC ON)
+set(DEFAULT_VALUE_ENABLE_MBEDTLS ON)
 set(DEFAULT_VALUE_ENABLE_MKV ON)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
 set(DEFAULT_VALUE_ENABLE_SILK ON)
@@ -90,6 +91,9 @@ list(APPEND EP_linphone_CMAKE_OPTIONS
 )
 set(EP_linphone_LINKING_TYPE "-DENABLE_STATIC=NO" "-DENABLE_SHARED=YES")
 
+# mbedtls
+set(EP_mbedtls_LINKING_TYPE "-DUSE_SHARED_MBEDTLS_LIBRARY=NO")
+
 # mediastreamer2
 list(APPEND EP_ms2_CMAKE_OPTIONS
 	"-DENABLE_RELATIVE_PREFIX=YES"

configs/config-bb10.cmake

@@ -23,6 +23,7 @@
 # Define default values for the linphone builder options
 set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
+set(DEFAULT_VALUE_ENABLE_MBEDTLS ON)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
@@ -70,6 +71,9 @@ list(APPEND EP_linphone_CMAKE_OPTIONS
 	"-DENABLE_CALL_LOGS_STORAGE=YES"
 )
 
+# mbedtls
+set(EP_mbedtls_LINKING_TYPE "-DUSE_SHARED_MBEDTLS_LIBRARY=NO")
+
 # mediastreamer2
 list(APPEND EP_ms2_CMAKE_OPTIONS
 	"-DENABLE_RELATIVE_PREFIX=YES"

configs/config-desktop.cmake

@@ -26,6 +26,7 @@ set(DEFAULT_VALUE_ENABLE_DTLS ON)
 set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
 set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
+set(DEFAULT_VALUE_ENABLE_MBEDTLS ON)
 set(DEFAULT_VALUE_ENABLE_MKV ON)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)

configs/config-ios.cmake

@@ -27,6 +27,7 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
 set(DEFAULT_VALUE_ENABLE_ILBC ON)
 set(DEFAULT_VALUE_ENABLE_ISAC ON)
+set(DEFAULT_VALUE_ENABLE_MBEDTLS ON)
 set(DEFAULT_VALUE_ENABLE_MKV ON)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
 set(DEFAULT_VALUE_ENABLE_SILK ON)
@@ -40,7 +41,7 @@ set(DEFAULT_VALUE_ENABLE_ZRTP ON)
 set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=YES" "-DENABLE_SHARED=NO")
 
 # Global configuration
-if (NOT LINPHONE_IOS_DEPLOYMENT_TARGET)
+if(NOT LINPHONE_IOS_DEPLOYMENT_TARGET)
 	set(LINPHONE_IOS_DEPLOYMENT_TARGET 6.0)
 endif()
 set(LINPHONE_BUILDER_HOST "${CMAKE_SYSTEM_PROCESSOR}-apple-darwin")
@@ -58,9 +59,9 @@ unset(CLANG_TARGET_SPECIFIER)
 unset(LINPHONE_IOS_DEPLOYMENT_TARGET)
 
 #XCode7 requires Cmake 3.3.20150815 at least
-if (NOT ${XCODE_VERSION} VERSION_LESS 7)
-	set (CMAKE_MIN_VERSION "3.3.20150815")
-	if (${CMAKE_VERSION} VERSION_LESS ${CMAKE_MIN_VERSION})
+if(NOT ${XCODE_VERSION} VERSION_LESS 7)
+	set(CMAKE_MIN_VERSION "3.3.20150815")
+	if(${CMAKE_VERSION} VERSION_LESS ${CMAKE_MIN_VERSION})
 		message(FATAL_ERROR "You need at least CMake version ${CMAKE_MIN_VERSION} but you are currently using ${CMAKE_VERSION}. There is no Cmake release available for it yet, so you must either compile it manually or revert to XCode6 temporary.")
 	endif()
 endif()
@@ -93,6 +94,9 @@ list(APPEND EP_linphone_CMAKE_OPTIONS
 	"-DENABLE_NLS=NO"
 )
 
+# mbedtls
+set(EP_mbedtls_LINKING_TYPE "-DUSE_SHARED_MBEDTLS_LIBRARY=NO")
+
 # mediastreamer2
 list(APPEND EP_ms2_CMAKE_OPTIONS
 	"-DENABLE_RELATIVE_PREFIX=YES"

configs/config-python.cmake

@@ -24,6 +24,7 @@
 set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
 set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
+set(DEFAULT_VALUE_ENABLE_MBEDTLS ON)
 set(DEFAULT_VALUE_ENABLE_MKV ON)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
@@ -87,6 +88,9 @@ list(APPEND EP_linphone_CMAKE_OPTIONS
 	"-DENABLE_UPNP=NO"
 )
 
+# mbedtls
+set(EP_mbedtls_LINKING_TYPE "-DUSE_SHARED_MBEDTLS_LIBRARY=NO")
+
 # ms2
 list(APPEND EP_ms2_CMAKE_OPTIONS
 	"-DENABLE_RELATIVE_PREFIX=YES"

configs/config-webplugin.cmake

@@ -24,6 +24,7 @@
 set(DEFAULT_VALUE_ENABLE_FFMPEG ON)
 set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
+set(DEFAULT_VALUE_ENABLE_POLARSSL ON)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
 set(DEFAULT_VALUE_ENABLE_VIDEO ON)

configs/config-win10.cmake

@@ -27,6 +27,7 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
 set(DEFAULT_VALUE_ENABLE_ILBC ON)
 set(DEFAULT_VALUE_ENABLE_ISAC ON)
+set(DEFAULT_VALUE_ENABLE_MBEDTLS ON)
 set(DEFAULT_VALUE_ENABLE_MKV ON)
 set(DEFAULT_VALUE_ENABLE_OPUS ON)
 set(DEFAULT_VALUE_ENABLE_SILK ON)

configs/config-windowsphone.cmake

@@ -24,6 +24,7 @@
 set(DEFAULT_VALUE_ENABLE_VIDEO ON)
 set(DEFAULT_VALUE_ENABLE_SRTP ON)
 set(DEFAULT_VALUE_ENABLE_GSM ON)
+set(DEFAULT_VALUE_ENABLE_POLARSSL ON)
 set(DEFAULT_VALUE_ENABLE_SPEEX ON)
 set(DEFAULT_VALUE_ENABLE_WASAPI ON)
 set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC ON)

options/bctoolbox.cmake

@@ -20,9 +20,9 @@
 #
 ############################################################################
 
-# belle-sip build options
+# bctoolbox build options
 
-option(ENABLE_POLARSSL "Enable polarssl support." ON)
+option(ENABLE_POLARSSL "Enable polarssl support." ${DEFAULT_VALUE_ENABLE_POLARSSL})
 add_feature_info("Polarssl" ENABLE_POLARSSL "Crypto stack implementation based on polarssl")
-option(ENABLE_MBEDTLS "Enable mbedtls support." OFF)
+option(ENABLE_MBEDTLS "Enable mbedtls support." ${DEFAULT_VALUE_ENABLE_MBEDTLS})
 add_feature_info("Mbedtls" ENABLE_MBEDTLS "Crypto stack implementation based on mbeddtls")