From 9c8b9f2f34d1d2efd7e15a978183f9c7956a6cba Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Thu, 27 Feb 2014 10:51:26 +0100
Subject: [PATCH] Fix build (removed remote provisioning flag, always compiled
 now)

---
 Makefile            | 3 +--
 submodules/linphone | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 70d8c7e14..99947a622 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,6 @@ endif
 NDK_DEBUG=0
 BUILD_VIDEO=1
 BUILD_UPNP=1
-BUILD_REMOTE_PROVISIONING=1
 BUILD_AMRNB=full # 0, light or full
 BUILD_AMRWB=1
 
@@ -349,7 +348,7 @@ 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_TUNNEL=$(BUILD_TUNNEL) BUILD_TLS=$(BUILD_TLS) BUILD_SQLITE=$(BUILD_SQLITE) \
 	BUILD_CONTACT_HEADER=$(BUILD_CONTACT_HEADER) BUILD_RTP_MAP=$(BUILD_RTP_MAP) \
 	LIBLINPHONE_EXTENDED_SRC_FILES="$(LIBLINPHONE_EXTENDED_SRC_FILES)" \
 	LIBLINPHONE_EXTENDED_C_INCLUDES="$(LIBLINPHONE_EXTENDED_C_INCLUDES)" \
diff --git a/submodules/linphone b/submodules/linphone
index c0bd6fb61..3cd4eb5e7 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit c0bd6fb61e03a3592ed4e3164f1234f68372b6b7
+Subproject commit 3cd4eb5e75c6f9606ead1a38e4708b8031c44191