From 84623b947479fb28de701c0b3445845b0aa08839 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Wed, 27 Nov 2013 17:05:20 +0100
Subject: [PATCH] Add flags for compilation with contact header and rtpmap
 Update linphone and bellesip

---
 Makefile                                  | 5 ++++-
 src/org/linphone/LinphonePreferences.java | 2 +-
 submodules/belle-sip                      | 2 +-
 submodules/linphone                       | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 05ff76077..c9b1a3879 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,8 @@ BUILD_FOR_X86=1
 USE_JAVAH=1
 BUILD_TLS=1
 BUILD_SQLITE=1
+BUILD_CONTACT_HEADER=0
+BUILD_RTP_MAP=0
 
 # Checks
 CHECK_MSG=$(shell ./check_tools.sh)
@@ -301,7 +303,8 @@ GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \
 
 LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \
 	LINPHONE_VERSION=$(LINPHONE_VERSION) BELLESIP_VERSION=$(BELLESIP_VERSION) USE_JAVAH=$(USE_JAVAH) \
-	BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_TLS=$(BUILD_TLS) BUILD_SQLITE=$(BUILD_SQLITE)
+	BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_TLS=$(BUILD_TLS) BUILD_SQLITE=$(BUILD_SQLITE) \
+	BUILD_CONTACT_HEADER=$(BUILD_CONTACT_HEADER) BUILD_RTP_MAP=$(BUILD_RTP_MAP)
 
 MEDIASTREAMER2_OPTIONS = $(GENERATE_OPTIONS) BUILD_MEDIASTREAMER2_SDK=1
 
diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java
index bab93b1db..03e5cedcf 100644
--- a/src/org/linphone/LinphonePreferences.java
+++ b/src/org/linphone/LinphonePreferences.java
@@ -278,7 +278,7 @@ public class LinphonePreferences {
 		if (proxy == null || proxy.length() <= 0) {
 			proxy = getAccountDomain(n);
 		}
-		if (!proxy.startsWith("sip:")) {
+		if (!proxy.contains("sip:")) {
 			proxy = "sip:" + proxy;
 		}
 		
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 38225cd88..7fa044d8d 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 38225cd88dfd1feeccd15fa88d42fb2261964a61
+Subproject commit 7fa044d8db5ea0e00cc5e7ea02858ed014b9ccb9
diff --git a/submodules/linphone b/submodules/linphone
index 4ddeb921c..41f0390f9 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 4ddeb921c1360f6c78753a49a0931eafcc9de4f0
+Subproject commit 41f0390f931534f9ae4872816e1449c354b79bf5