wizard must be optionnal, add G729 payload type

diff --git a/configure.ac b/configure.ac
index ec64910fe4372909924efc217d6ebd98df2b93fa..c2029267fd2d004a4938b0797f639784912800ab 100644 (file)
--- 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 96a27d02b385a072b34fc2f8526b4c824fb77603..17d0d77d34df807212b8c46198c0827eba468cd6 100644 (file)
--- 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 735c4705a72648c1f5da98ac47eeaf42a5b50036..cc1cd8fb8524cc8ad065ba013c2cb2832ff4a1af 100644 (file)
--- 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 d6b459c5fa9d10e4e4acb70a70926ccc51cb2a6c..3f32328de655f0f9d8dddfc15dff4bbff9fae15d 100644 (file)
--- 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 030084840cc1cae3cbb7470d462d6e787d7c531f..fbc201571d8ea4bdc208e87d2f81a109b8ebe060 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 030084840cc1cae3cbb7470d462d6e787d7c531f
+Subproject commit fbc201571d8ea4bdc208e87d2f81a109b8ebe060

diff --git a/oRTP b/oRTP
index 681e777d75b4e04f115034a5a90d3f27b99abe08..92f78b9504915db0220bc6f617f0cd7ad9910771 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 681e777d75b4e04f115034a5a90d3f27b99abe08
+Subproject commit 92f78b9504915db0220bc6f617f0cd7ad9910771