external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Always enable SRS_SSL

Browse source
This commit is contained in:
winlin 2018-12-22 20:08:42 +08:00
parent 0bc7fdbb35
commit e4e6dd2169
2 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
trunk/auto/options.sh
View file

@ -389,7 +389,6 @@ function apply_user_presets() {
if [ $SRS_DISABLE_ALL = YES ]; then
SRS_HDS=NO
SRS_NGINX=NO
SRS_SSL=NO
SRS_FFMPEG_TOOL=NO
SRS_INGEST=NO
SRS_STREAM_CASTER=NO
@ -410,7 +409,6 @@ function apply_user_presets() {
if [ $SRS_ENABLE_ALL = YES ]; then
SRS_HDS=YES
SRS_NGINX=YES
SRS_SSL=YES
SRS_FFMPEG_TOOL=YES
SRS_INGEST=YES
SRS_STREAM_CASTER=YES
@ -431,7 +429,6 @@ function apply_user_presets() {
if [ $SRS_FAST = YES ]; then
SRS_HDS=NO
SRS_NGINX=NO
SRS_SSL=NO
SRS_FFMPEG_TOOL=NO
SRS_INGEST=NO
SRS_STREAM_CASTER=NO
@ -452,7 +449,6 @@ function apply_user_presets() {
if [ $SRS_PURE_RTMP = YES ]; then
SRS_HDS=NO
SRS_NGINX=NO
SRS_SSL=YES
SRS_FFMPEG_TOOL=NO
SRS_INGEST=NO
SRS_STREAM_CASTER=NO
@ -473,7 +469,6 @@ function apply_user_presets() {
if [ $SRS_ARM_UBUNTU12 = YES ]; then
SRS_HDS=YES
SRS_NGINX=NO
SRS_SSL=YES
SRS_FFMPEG_TOOL=NO
SRS_INGEST=YES
SRS_STREAM_CASTER=YES
@ -495,7 +490,6 @@ function apply_user_presets() {
if [ $SRS_MIPS_UBUNTU12 = YES ]; then
SRS_HDS=YES
SRS_NGINX=NO
SRS_SSL=YES
SRS_FFMPEG_TOOL=NO
SRS_INGEST=YES
SRS_STREAM_CASTER=YES
@ -516,7 +510,6 @@ function apply_user_presets() {
if [ $SRS_X86_X64 = YES ]; then
SRS_HDS=YES
SRS_NGINX=NO
SRS_SSL=YES
SRS_FFMPEG_TOOL=NO
SRS_INGEST=YES
SRS_STREAM_CASTER=YES
@ -537,7 +530,6 @@ function apply_user_presets() {
if [ $SRS_OSX = YES ]; then
SRS_HDS=YES
SRS_NGINX=NO
SRS_SSL=YES
SRS_FFMPEG_TOOL=NO
SRS_INGEST=YES
SRS_STREAM_CASTER=YES
@ -561,7 +553,6 @@ function apply_user_presets() {
if [ $SRS_DEV = YES ]; then
SRS_HDS=YES
SRS_NGINX=NO
SRS_SSL=YES
SRS_FFMPEG_TOOL=YES
SRS_INGEST=YES
SRS_STREAM_CASTER=YES
@ -582,7 +573,6 @@ function apply_user_presets() {
if [ $SRS_FAST_DEV = YES ]; then
SRS_HDS=YES
SRS_NGINX=NO
SRS_SSL=YES
SRS_FFMPEG_TOOL=NO
SRS_INGEST=YES
SRS_STREAM_CASTER=YES
@ -603,7 +593,6 @@ function apply_user_presets() {
if [ $SRS_DEMO = YES ]; then
SRS_HDS=YES
SRS_NGINX=NO
SRS_SSL=YES
SRS_FFMPEG_TOOL=YES
SRS_INGEST=YES
SRS_STREAM_CASTER=YES
@ -624,7 +613,6 @@ function apply_user_presets() {
if [ $SRS_PI = YES ]; then
SRS_HDS=YES
SRS_NGINX=NO
SRS_SSL=YES
SRS_FFMPEG_TOOL=NO
SRS_INGEST=YES
SRS_STREAM_CASTER=YES
@ -645,7 +633,6 @@ function apply_user_presets() {
if [ $SRS_CUBIE = YES ]; then
SRS_HDS=YES
SRS_NGINX=NO
SRS_SSL=YES
SRS_FFMPEG_TOOL=YES
SRS_INGEST=YES
SRS_STREAM_CASTER=NO

28
trunk/configure vendored
View file

@ -101,7 +101,9 @@ SrsGprof=""; SrsGprofLink=""; if [ $SRS_GPROF = YES ]; then SrsGprof=" -pg -lc_p
SrsGperf=""; SrsGperfLink=""; if [ $SRS_GPERF = YES ]; then SrsGperfLink=" -lpthread"; fi
# the cxx flag generated.
CXXFLAGS="${CXXFLAGS} ${CppStd}${WarnLevel}${GDBDebug}${LibraryCompile}${SrsGprof}"
if [ $SRS_GPERF = YES ]; then CXXFLAGS="${CXXFLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free"; fi
if [ $SRS_GPERF = YES ]; then
CXXFLAGS="${CXXFLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free";
fi
# Start to generate the Makefile.
cat << END > ${SRS_OBJS}/${SRS_MAKEFILE}
GCC = gcc
@ -126,19 +128,31 @@ END
LibSTRoot="${SRS_OBJS_DIR}/st"; LibSTfile="${LibSTRoot}/libst.a"
# openssl-1.1.0e, for the RTMP complex handshake.
LibSSLRoot="";LibSSLfile=""
if [ $SRS_SSL = YES ]; then if [ $SRS_USE_SYS_SSL = NO ]; then LibSSLRoot="${SRS_OBJS_DIR}/openssl/include"; LibSSLfile="${SRS_OBJS_DIR}/openssl/lib/libssl.a ${SRS_OBJS_DIR}/openssl/lib/libcrypto.a"; fi fi
if [ $SRS_SSL = YES && $SRS_USE_SYS_SSL = NO ]; then
LibSSLRoot="${SRS_OBJS_DIR}/openssl/include"; LibSSLfile="${SRS_OBJS_DIR}/openssl/lib/libssl.a ${SRS_OBJS_DIR}/openssl/lib/libcrypto.a";
fi
# gperftools-2.1, for mem check and mem/cpu profile
LibGperfRoot=""; LibGperfFile=""
if [ $SRS_GPERF = YES ]; then LibGperfRoot="${SRS_OBJS_DIR}/gperf/include"; LibGperfFile="${SRS_OBJS_DIR}/gperf/lib/libtcmalloc_and_profiler.a"; fi
if [ $SRS_GPERF_MD = YES ]; then LibGperfFile="${SRS_OBJS_DIR}/gperf/lib/libtcmalloc_debug.a"; fi
if [ $SRS_GPERF = YES ]; then
LibGperfRoot="${SRS_OBJS_DIR}/gperf/include"; LibGperfFile="${SRS_OBJS_DIR}/gperf/lib/libtcmalloc_and_profiler.a";
fi
if [ $SRS_GPERF_MD = YES ]; then
LibGperfFile="${SRS_OBJS_DIR}/gperf/lib/libtcmalloc_debug.a";
fi
# the link options, always use static link
SrsLinkOptions="-ldl";
if [ $SRS_SSL = YES ]; then if [ $SRS_USE_SYS_SSL = YES ]; then SrsLinkOptions="${SrsLinkOptions} -lssl -lcrypto"; fi fi
if [ $SRS_SSL = YES && $SRS_USE_SYS_SSL = YES ]; then
SrsLinkOptions="${SrsLinkOptions} -lssl -lcrypto";
fi
# if static specified, add static
# TODO: FIXME: remove static.
if [ $SRS_STATIC = YES ]; then SrsLinkOptions="${SrsLinkOptions} -static"; fi
if [ $SRS_STATIC = YES ]; then
SrsLinkOptions="${SrsLinkOptions} -static";
fi
# if mips, add -lgcc_eh, or stl compile failed.
if [ $SRS_MIPS_UBUNTU12 = YES ]; then SrsLinkOptions="${SrsLinkOptions} -lgcc_eh"; fi
if [ $SRS_MIPS_UBUNTU12 = YES ]; then
SrsLinkOptions="${SrsLinkOptions} -lgcc_eh";
fi
#####################################################################################
# Modules, compile each module, then link to binary