Commit 4c95c0b2 authored by Simon Morlat's avatar Simon Morlat

be more permissive if bzrtp is found but not srtp but zrtp was not required

parent 0f8a2c76
......@@ -1117,18 +1117,23 @@ if test "$zrtp" != "false" ; then
fi
if test "$found_zrtp" = "true" ; then
if test "$have_srtp" = "no" ; then
AC_MSG_ERROR("ZRTP requires SRTP")
if test "$zrtp" = "true" ; then
AC_MSG_ERROR("ZRTP requires SRTP")
else
AC_MSG_WARN("ZRTP requires SRTP")
zrtp=false
fi
else
AC_DEFINE(HAVE_ZRTP, 1, [Defined when zrtp support is compiled])
LIBS="$LIBS $LIBBZRTP_LIBS"
CFLAGS="$CFLAGS $LIBBZRTP_CFLAGS"
zrtp=true
fi
AC_DEFINE(HAVE_ZRTP, 1, [Defined when zrtp support is compiled])
LIBS="$LIBS $LIBBZRTP_LIBS"
CFLAGS="$CFLAGS $LIBBZRTP_CFLAGS"
zrtp=true
else
zrtp=false
fi
else
echo "ZRTP compilation is disabled."
fi
AM_CONDITIONAL(LIBBZRTP,test x$zrtp != xfalse)
dnl Polarssl lib is requested for DTLS
......
......@@ -82,7 +82,7 @@ static SoundDeviceDescription devices[]={
{ "samsung", "SAMSUNG-SGH-I337","", DEVICE_HAS_BUILTIN_AEC | DEVICE_HAS_BUILTIN_OPENSLES_AEC, 0 }, /* Galaxy S4 ? */
{ "samsung", "GT-I9195", "", DEVICE_HAS_BUILTIN_AEC | DEVICE_HAS_BUILTIN_OPENSLES_AEC, 0 }, /* Galaxy S4 mini*/
{ "samsung", "GT-N7000", "", DEVICE_HAS_BUILTIN_AEC, 0 }, /*Galaxy Note*/
{ "samsung", "GT-N7100", "", DEVICE_HAS_BUILTIN_AEC, 0 }, /*Galaxy Note 2*/
{ "samsung", "GT-N7100", "exynos4", DEVICE_HAS_BUILTIN_AEC_CRAPPY,370 }, /*Galaxy Note 2 - built-in echo canceller is not reliable */
{ "samsung", "GT-N7105", "", DEVICE_HAS_BUILTIN_AEC, 0 }, /*Galaxy Note 2*/
{ "samsung", "SGH-T889", "", DEVICE_HAS_BUILTIN_AEC, 0 }, /*Galaxy Note 2*/
{ "samsung", "Nexus S", "s5pc110", DEVICE_HAS_BUILTIN_AEC_CRAPPY, 180 }, /*Nexus S gives calibration around 240ms, but in practice the internal buffer size shrinks after a couple of seconds.*/
......@@ -122,6 +122,7 @@ static SoundDeviceDescription devices[]={
{ "Yota Devices Limited", "YD201", "msm8974", DEVICE_HAS_BUILTIN_AEC | DEVICE_HAS_BUILTIN_OPENSLES_AEC, 0, 48000 }, /* Yotaphone 2 */
{ "Sony", "D6503", "msm8974",DEVICE_HAS_BUILTIN_AEC_CRAPPY,280},
{ "Sony", "D6603", "msm8974",DEVICE_HAS_BUILTIN_AEC_CRAPPY,280},
{ NULL, NULL, NULL, 0, 0,0}
};
......
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