[Pkg-voip-commits] [janus] 38/282: Merge branch 'master' into nosip

[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 62e98dcce8d0b1a4615910fc66871c0fc17d5137
Merge: 0073040 042a667
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Mon May 22 18:46:36 2017 +0200

    Merge branch 'master' into nosip

 configure.ac                | 166 +++++++++++++++++++++++++++++++-------------
 html/devicetest.html        |  18 ++++-
 html/devicetest.js          |  44 ++++++++++--
 html/echotest.js            |   2 +-
 html/siptest.js             |  22 +++---
 mainpage.dox                |   5 ++
 plugins/janus_audiobridge.c |   2 +-
 plugins/janus_sip.c         |  30 ++++----
 record.c                    |   3 -
 9 files changed, 199 insertions(+), 93 deletions(-)

diff --cc configure.ac
index ebaf5af,459a088..5c6957b
--- 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-nosip],
 +              [AS_HELP_STRING([--disable-plugin-nosip],
 +                              [Disable nosip plugin])],
 +              [],
 +              [enable_plugin_nosip=yes])
 +
  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