sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add configure option to disable srtp (#3002)

This commit is contained in:
sauwming 2022-05-04 09:33:28 +08:00 committed by GitHub
parent 7231318c9c
commit fe6cbbc397
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
aconfigure
View File

@ -657,6 +657,7 @@ ac_webrtc_cflags
ac_webrtc_instset
ac_no_webrtc
ac_no_yuv
ac_no_srtp
ac_no_bcg729
opus_present
opus_h_present
@ -879,6 +880,7 @@ with_opus
enable_opus
with_bcg729
enable_bcg729
enable_libsrtp
enable_libyuv
enable_libwebrtc
enable_libwebrtc_aec3
@ -1565,6 +1567,7 @@ Optional Features:
autodetect)
--disable-bcg729 Disable bcg729 (default: not disabled)
--disable-libsrtp Exclude libsrtp in the build
--disable-libyuv Exclude libyuv in the build
--disable-libwebrtc Exclude libwebrtc in the build
--enable-libwebrtc-aec3 Build libwebrtc-aec3 that's included in PJSIP
@ -9884,6 +9887,23 @@ fi
# Check whether --enable-libsrtp was given.
if test ${enable_libsrtp+y}
then :
enableval=$enable_libsrtp; if test "$enable_libsrtp" = "no"; then
ac_no_srtp=1
CFLAGS="$CFLAGS -DPJMEDIA_HAS_SRTP=0"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libsrtp is disabled...yes" >&5
printf "%s\n" "Checking if libsrtp is disabled...yes" >&6; }
fi
else $as_nop
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Checking if libsrtp is disabled...no" >&5
printf "%s\n" "Checking if libsrtp is disabled...no" >&6; }
fi
# Check whether --enable-libyuv was given.
if test ${enable_libyuv+y}
then :

13
aconfigure.ac
View File

@ -2201,6 +2201,19 @@ AC_ARG_ENABLE(bcg729,
])
dnl # Include libsrtp
AC_SUBST(ac_no_srtp)
AC_ARG_ENABLE(libsrtp,
AS_HELP_STRING([--disable-libsrtp],
[Exclude libsrtp in the build]),
[if test "$enable_libsrtp" = "no"; then
[ac_no_srtp=1]
CFLAGS="$CFLAGS -DPJMEDIA_HAS_SRTP=0"
AC_MSG_RESULT([Checking if libsrtp is disabled...yes])
fi],
AC_MSG_RESULT([Checking if libsrtp is disabled...no]))
dnl # Include libyuv
AC_SUBST(ac_no_yuv)
AC_ARG_ENABLE(libyuv,

2
build.mak.in
View File

@ -41,6 +41,7 @@ export APP_THIRD_PARTY_EXT :=
export APP_THIRD_PARTY_LIBS :=
export APP_THIRD_PARTY_LIB_FILES :=
ifneq (@ac_no_srtp@,1)
ifneq (@ac_external_srtp@,0)
# External SRTP library
APP_THIRD_PARTY_EXT += -l@ac_external_srtp_lib@
@ -53,6 +54,7 @@ APP_THIRD_PARTY_LIBS += -lsrtp
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libsrtp.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libsrtp.$(SHLIB_SUFFIX)
endif
endif
endif
ifeq (@ac_pjmedia_resample@,libresample)
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX)

2
third_party/build/os-auto.mak.in vendored
View File

@ -43,10 +43,12 @@ ifneq ($(findstring windows_os,@ac_pjmedia_video@),)
DIRS += baseclasses
endif
ifneq (@ac_no_srtp@,1)
ifneq (@ac_external_srtp@,0)
# External SRTP
else
DIRS += srtp
endif
ifeq (@ac_ssl_has_aes_gcm@,0)
CIPHERS_SRC = crypto/cipher/aes.o crypto/cipher/aes_icm.o \