From 7a4c75452f3110f8d6a3ad06389a56b315f0659f Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Sun, 5 Feb 2012 11:27:09 +0100
Subject: [PATCH] wizard must be optionnal, add G729 payload type

---
 configure.ac           | 3 ++-
 coreapi/Makefile.am    | 8 +++++++-
 coreapi/linphonecore.c | 1 +
 coreapi/sipsetup.c     | 4 ++++
 mediastreamer2         | 2 +-
 oRTP                   | 2 +-
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index ec64910f..c2029267 100644
--- a/configure.ac
+++ b/configure.ac
@@ -413,9 +413,10 @@ if test "$has_sighandler_t" = "yes" ; then
 fi
 
 dnl check libsoup (needed for wizard)
-PKG_CHECK_MODULES(LIBSOUP, [libsoup-2.4 >= 2.26])
+PKG_CHECK_MODULES(LIBSOUP, [libsoup-2.4 >= 2.26],[build_wizard=true],foo=bar)
 AC_SUBST(LIBSOUP_CFLAGS)
 AC_SUBST(LIBSOUP_LIBS)
+AM_CONDITIONAL(BUILD_WIZARD, test x$build_wizard = xtrue)
 
 ##################################################
 # Stricter build options (after external packages)
diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 96a27d02..17d0d77d 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -38,10 +38,12 @@ liblinphone_la_SOURCES=\
 	linphonecall.c \
 	sipsetup.c sipsetup.h \
 	siplogin.c \
-	sipwizard.c \
 	lsd.c linphonecore_utils.h \
 	ec-calibrator.c \
 	conference.c 
+if BUILD_WIZARD
+	liblinphone_la_SOURCES+=sipwizard.c 
+endif
 
 if BUILD_TUNNEL
 liblinphone_la_SOURCES+=TunnelManager.cc TunnelManager.hh linphone_tunnel.cc
@@ -83,3 +85,7 @@ AM_CFLAGS=$(STRICT_OPTIONS)  -DIN_LINPHONE \
 	-DORTP_INET6 \
 	$(VIDEO_CFLAGS) \
 	$(TUNNEL_CFLAGS)
+
+if BUILD_WIZARD
+AM_CFLAGS+= -DBUILD_WIZARD 
+endif
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 735c4705..cc1cd8fb 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1070,6 +1070,7 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta
 	linphone_core_assign_payload_type(lc,&payload_type_silk_mb,-1,NULL);
 	linphone_core_assign_payload_type(lc,&payload_type_silk_wb,-1,NULL);
 	linphone_core_assign_payload_type(lc,&payload_type_silk_swb,-1,NULL);
+	linphone_core_assign_payload_type(lc,&payload_type_g729,18,NULL);
 	
 	ms_init();
 	/* create a mediastreamer2 event queue and set it as global */
diff --git a/coreapi/sipsetup.c b/coreapi/sipsetup.c
index d6b459c5..3f32328d 100644
--- a/coreapi/sipsetup.c
+++ b/coreapi/sipsetup.c
@@ -30,10 +30,14 @@ static SipSetup *all_sip_setups[]={
 	NULL
 };
 #else
+#ifdef BUILD_WIZARD
 extern SipSetup linphone_sip_wizard;
+#endif
 static SipSetup *all_sip_setups[]={
 	&linphone_sip_login,
+#ifdef BUILD_WIZARD
 	&linphone_sip_wizard,
+#endif
 	NULL
 };
 #endif
diff --git a/mediastreamer2 b/mediastreamer2
index 03008484..fbc20157 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 030084840cc1cae3cbb7470d462d6e787d7c531f
+Subproject commit fbc201571d8ea4bdc208e87d2f81a109b8ebe060
diff --git a/oRTP b/oRTP
index 681e777d..92f78b95 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 681e777d75b4e04f115034a5a90d3f27b99abe08
+Subproject commit 92f78b9504915db0220bc6f617f0cd7ad9910771
-- 
2.39.2