Commit 7a4c7545 authored by jehan's avatar jehan
Browse files

wizard must be optionnal, add G729 payload type

parent dd207a26
......@@ -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)
......
......@@ -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
......@@ -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 */
......
......@@ -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
......
mediastreamer2 @ fbc20157
Subproject commit 030084840cc1cae3cbb7470d462d6e787d7c531f
Subproject commit fbc201571d8ea4bdc208e87d2f81a109b8ebe060
oRTP @ 92f78b95
Subproject commit 681e777d75b4e04f115034a5a90d3f27b99abe08
Subproject commit 92f78b9504915db0220bc6f617f0cd7ad9910771
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment