From c94c27cf8461e477b5a2acf01574ef9222485c64 Mon Sep 17 00:00:00 2001
From: "Alfred E. Heggestad" <aeh@db.org>
Date: Wed, 18 Jun 2014 23:59:37 +0200
Subject: srtp: split srtp-module into 'srtp' and 'libsrtp'

libre v0.4.9 has a very fast and robust SRTP-stack and we want
to use it in baresip. however libsrtp is also working so we want
to keep the module using libsrtp around for a while.

two modules providing SDES-SRTP:

- libsrtp.so  -- SRTP using libsrtp
- srtp.so     -- Native SRTP-stack in libre
---
 mk/modules.mk | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'mk/modules.mk')

diff --git a/mk/modules.mk b/mk/modules.mk
index 339391b..1f74f6a 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -23,6 +23,7 @@
 #   USE_ILBC          iLBC audio codec
 #   USE_ISAC          iSAC audio codec
 #   USE_L16           L16 audio codec
+#   USE_LIBSRTP       Secure RTP module using libsrtp
 #   USE_MPG123        Use mpg123
 #   USE_OPUS          Opus audio codec
 #   USE_OSS           OSS audio driver
@@ -34,7 +35,7 @@
 #   USE_SPEEX         Speex audio codec
 #   USE_SPEEX_AEC     Speex Acoustic Echo Canceller
 #   USE_SPEEX_PP      Speex preprocessor
-#   USE_SRTP          Secure RTP module
+#   USE_SRTP          Secure RTP module using libre
 #   USE_STDIO         stdio input driver
 #   USE_SYSLOG        Syslog module
 #   USE_UUID          UUID module
@@ -147,7 +148,7 @@ USE_SPEEX_PP := $(shell [ -f $(SYSROOT)/include/speex_preprocess.h ] || \
 	[ -f $(SYSROOT)/local/include/speex/speex_preprocess.h ] || \
 	[ -f $(SYSROOT_ALT)/include/speex/speex_preprocess.h ] || \
 	[ -f $(SYSROOT)/include/speex/speex_preprocess.h ] && echo "yes")
-USE_SRTP := $(shell [ -f $(SYSROOT)/include/srtp/srtp.h ] || \
+USE_LIBSRTP := $(shell [ -f $(SYSROOT)/include/srtp/srtp.h ] || \
 	[ -f $(SYSROOT_ALT)/include/srtp/srtp.h ] || \
 	[ -f $(SYSROOT)/local/include/srtp/srtp.h ] && echo "yes")
 USE_SYSLOG := $(shell [ -f $(SYSROOT)/include/syslog.h ] || \
@@ -219,6 +220,7 @@ MODULES   += $(EXTRA_MODULES)
 MODULES   += stun turn ice natbd auloop presence
 MODULES   += menu contact vumeter mwi account natpmp httpd
 MODULES   += selftest
+MODULES   += srtp
 ifneq ($(HAVE_PTHREAD),)
 MODULES   += aubridge
 endif
@@ -339,8 +341,8 @@ endif
 ifneq ($(USE_SPEEX_PP),)
 MODULES   += speex_pp
 endif
-ifneq ($(USE_SRTP),)
-MODULES   += srtp
+ifneq ($(USE_LIBSRTP),)
+MODULES   += libsrtp
 ifneq ($(USE_DTLS_SRTP),)
 MODULES   += dtls_srtp
 endif
-- 
cgit v1.2.1