summaryrefslogtreecommitdiff
path: root/third-party
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2017-12-04 00:49:14 +0000
committerJoshua Colp <jcolp@digium.com>2017-12-03 18:54:04 -0600
commite2715d2cd4aa72ee256dd1d56e813046a0408f9a (patch)
tree7a8efa5dca564f80623414b56f171be92d3abcb3 /third-party
parent075faac2fd74a79b4f418d1d02a864383b076d05 (diff)
pjproject: Clean up disabling of WebRTC support.
The definition in config_site.h and the argument to the configure script are not necessary to disable WebRTC support. The correct argument, --disable-libwebrtc, is already passed. ASTERISK-26980 Change-Id: I27da2c894f87914956a72710222e17462d8a44bc
Diffstat (limited to 'third-party')
-rw-r--r--third-party/pjproject/Makefile.rules3
-rw-r--r--third-party/pjproject/patches/config_site.h6
2 files changed, 1 insertions, 8 deletions
diff --git a/third-party/pjproject/Makefile.rules b/third-party/pjproject/Makefile.rules
index 56b2c4934..715a4b8cd 100644
--- a/third-party/pjproject/Makefile.rules
+++ b/third-party/pjproject/Makefile.rules
@@ -37,8 +37,7 @@ PJPROJECT_CONFIG_OPTS = $(PJPROJECT_CONFIGURE_OPTS) --prefix=/opt/pjproject \
--disable-ipp \
--disable-libwebrtc \
--without-external-pa \
- --without-external-srtp \
- --without-external-webrtc
+ --without-external-srtp
ifeq ($(findstring TEST_FRAMEWORK,$(MENUSELECT_CFLAGS)),)
PJPROJECT_CONFIG_OPTS += --disable-resample --disable-g711-codec
diff --git a/third-party/pjproject/patches/config_site.h b/third-party/pjproject/patches/config_site.h
index a11bc0640..d5aee82cc 100644
--- a/third-party/pjproject/patches/config_site.h
+++ b/third-party/pjproject/patches/config_site.h
@@ -20,12 +20,6 @@
*/
#define PJMEDIA_HAS_SRTP 0
-/*
- * Defining PJMEDIA_HAS_WEBRTC_AEC to 0 does NOT disable Asterisk's ability to use
- * webrtc. It only disables the pjmedia webrtc transport which Asterisk doesn't use.
- */
-#define PJMEDIA_HAS_WEBRTC_AEC 0
-
#define PJ_HAS_IPV6 1
#if !defined(AST_DEVMODE) && !defined(PJPROJECT_BUNDLED_ASSERTIONS)
#define NDEBUG 1