external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 19:31:53 +00:00
Code Issues Releases Wiki Activity

change warn to trace for nginx disabled

Browse source
This commit is contained in:
winlin 2014-04-06 19:19:13 +08:00
parent d546f815df
commit 5ff1d589f7
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
trunk/auto/options.sh
View file

@ -17,25 +17,35 @@ SRS_HLS=RESERVED
SRS_NGINX=RESERVED SRS_NGINX=RESERVED
SRS_SSL=RESERVED SRS_SSL=RESERVED
SRS_FFMPEG=RESERVED SRS_FFMPEG=RESERVED
SRS_TRANSCODE=RESERVED
SRS_HTTP_PARSER=RESERVED SRS_HTTP_PARSER=RESERVED
SRS_HTTP_CALLBACK=RESERVED SRS_HTTP_CALLBACK=RESERVED
SRS_HTTP_SERVER=RESERVED SRS_HTTP_SERVER=RESERVED
SRS_HTTP_API=RESERVED SRS_HTTP_API=RESERVED
SRS_LIBRTMP=RESERVED # srs-librtmp SRS_LIBRTMP=RESERVED
SRS_BWTC=RESERVED # srs-bandwidth-test client # srs-bandwidth-test client
SRS_BWTC=RESERVED
SRS_RESEARCH=RESERVED SRS_RESEARCH=RESERVED
SRS_UTEST=RESERVED SRS_UTEST=RESERVED
SRS_GPERF=RESERVED # tcmalloc # tcmalloc
SRS_GPERF_MC=RESERVED # gperf memory check SRS_GPERF=RESERVED
SRS_GPERF_MP=RESERVED # gperf memory profile # gperf memory check
SRS_GPERF_CP=RESERVED # gperf cpu profile SRS_GPERF_MC=RESERVED
SRS_GPROF=RESERVED # gprof # gperf memory profile
SRS_ARM_UBUNTU12=RESERVED # armhf(v7cpu) built on ubuntu12 SRS_GPERF_MP=RESERVED
# gperf cpu profile
SRS_GPERF_CP=RESERVED
# gprof
SRS_GPROF=RESERVED
# armhf(v7cpu) built on ubuntu12
SRS_ARM_UBUNTU12=RESERVED
#
# arguments # arguments
SRS_PREFIX=/usr/local/srs SRS_PREFIX=/usr/local/srs
SRS_JOBS=1 SRS_JOBS=1
SRS_STATIC=RESERVED SRS_STATIC=RESERVED
SRS_HTTP_PARSER=NO SRS_HTTP_PARSER=NO
#
# private internal # private internal
# dev, open all features for dev, no gperf/prof/arm. # dev, open all features for dev, no gperf/prof/arm.
SRS_DEV=NO SRS_DEV=NO
@ -165,7 +175,7 @@ fi
# if dev specified, open features if possible. # if dev specified, open features if possible.
if [ $SRS_DEV = YES ]; then if [ $SRS_DEV = YES ]; then
SRS_HLS=YES SRS_HLS=YES
SRS_NGINX=YES SRS_NGINX=NO
SRS_SSL=YES SRS_SSL=YES
SRS_FFMPEG=YES SRS_FFMPEG=YES
SRS_HTTP_CALLBACK=YES SRS_HTTP_CALLBACK=YES

8
trunk/configure vendored
View file

@ -499,18 +499,14 @@ echo ""
echo "configure summary:" echo "configure summary:"
echo " ${SRS_CONFIGURE}" echo " ${SRS_CONFIGURE}"
if [ $SRS_HLS = YES ]; then if [ $SRS_HLS = YES ]; then
echo -e "${GREEN}HLS over nginx is enabled${BLACK}" echo -e "${GREEN}HLS is enabled${BLACK}"
else else
echo -e "${YELLOW}warning: without HLS support${BLACK}" echo -e "${YELLOW}warning: without HLS support${BLACK}"
fi fi
if [ $SRS_NGINX = YES ]; then if [ $SRS_NGINX = YES ]; then
echo -e "${GREEN}Nginx http server is enabled${BLACK}" echo -e "${GREEN}Nginx http server is enabled${BLACK}"
else else
if [ $SRS_HLS = YES ]; then echo -e "${GREEN}note: Nginx http server is disabled${BLACK}"
echo -e "${YELLOW}warning: HLS without Nginx support${BLACK}"
else
echo -e "${GREEN}note: HLS without Nginx support${BLACK}"
fi
fi fi
if [ $SRS_SSL = YES ]; then if [ $SRS_SSL = YES ]; then
echo -e "${GREEN}rtmp complex handshake is enabled${BLACK}" echo -e "${GREEN}rtmp complex handshake is enabled${BLACK}"