diff options
| author | Jason Parker <jparker@digium.com> | 2013-03-11 15:51:17 -0500 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2013-03-11 15:51:17 -0500 |
| commit | af93a26aa321d3620925e5df68574226ba6cec3c (patch) | |
| tree | c73301bfef50ae9ba250285bbcc7879f5c837e04 /third_party | |
| parent | 09114052f74fe74bbf652189cedefe41b7141b86 (diff) | |
| parent | 9550ec7a68b8d072f99872d44def5004dbcc2562 (diff) | |
Merge branch 'patch/external-srtp' of github.com:asterisk/pjproject
Conflicts:
build.mak.in
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/build/Makefile | 2 | ||||
| -rw-r--r-- | third_party/build/os-auto.mak.in | 5 |
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 |