[Pkg-voip-commits] [janus] 40/282: Merge branch 'master' into sipre

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.2.6-1
in repository janus.

commit b741b6b7785b6f86e34c598c8ee2dabd528f6458
Merge: 2a0e4a6 042a667
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Mon May 22 18:51:46 2017 +0200

    Merge branch 'master' into sipre

 configure.ac                | 166 +++++++++++++++++++++++++++++++-------------
 html/devicetest.html        |  18 ++++-
 html/devicetest.js          |  44 ++++++++++--
 html/echotest.js            |   2 +-
 plugins/janus_audiobridge.c |   2 +-
 record.c                    |   3 -
 6 files changed, 171 insertions(+), 64 deletions(-)

diff --cc configure.ac
index 19983ef,459a088..c446c00
--- a/configure.ac
+++ b/configure.ac
@@@ -406,15 -466,10 +466,16 @@@ AC_ARG_ENABLE([plugin-recordplay]
  AC_ARG_ENABLE([plugin-sip],
                [AS_HELP_STRING([--disable-plugin-sip],
                                [Disable sip plugin])],
-               [],
+               [AS_IF([test "x$enable_plugin_sip" != "xyes"],
+                      [enable_plugin_sip=no])],
                [enable_plugin_sip=maybe])
  
 +AC_ARG_ENABLE([plugin-sipre],
 +              [AS_HELP_STRING([--disable-plugin-sipre],
 +                              [Disable sipre plugin])],
 +              [],
 +              [enable_plugin_sipre=maybe])
 +
  AC_ARG_ENABLE([plugin-streaming],
                [AS_HELP_STRING([--disable-plugin-streaming],
                                [Disable streaming plugin])],

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git