summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
authorJason Parker <jparker@digium.com>2013-02-27 14:11:39 -0600
committerJason Parker <jparker@digium.com>2013-03-11 15:43:43 -0500
commit9550ec7a68b8d072f99872d44def5004dbcc2562 (patch)
treeb9e1c609e826756312b4db5541efdcc2ccabbbaa /third_party
parent02db7e76db5d3adde402bbc2d4e88607ba9960ed (diff)
Add support for using external libsrtp.
Diffstat (limited to 'third_party')
-rw-r--r--third_party/build/Makefile2
-rw-r--r--third_party/build/os-auto.mak.in5
2 files changed, 6 insertions, 1 deletions
diff --git a/third_party/build/Makefile b/third_party/build/Makefile
index 36d8061..8cfe9cf 100644
--- a/third_party/build/Makefile
+++ b/third_party/build/Makefile
@@ -1,4 +1,4 @@
-DIRS = resample milenage srtp
+DIRS = resample milenage
include ../../build.mak
include $(PJDIR)/build/common.mak
diff --git a/third_party/build/os-auto.mak.in b/third_party/build/os-auto.mak.in
index f1de03f..dfc32a9 100644
--- a/third_party/build/os-auto.mak.in
+++ b/third_party/build/os-auto.mak.in
@@ -31,3 +31,8 @@ DIRS += portaudio
endif
endif
+ifeq (@ac_external_srtp@,1)
+# External SRTP
+else
+DIRS += srtp
+endif