正在显示
2 个修改的文件
包含
21 行增加
和
15 行删除
| @@ -17,25 +17,35 @@ SRS_HLS=RESERVED | @@ -17,25 +17,35 @@ SRS_HLS=RESERVED | ||
| 17 | SRS_NGINX=RESERVED | 17 | SRS_NGINX=RESERVED |
| 18 | SRS_SSL=RESERVED | 18 | SRS_SSL=RESERVED |
| 19 | SRS_FFMPEG=RESERVED | 19 | SRS_FFMPEG=RESERVED |
| 20 | +SRS_TRANSCODE=RESERVED | ||
| 20 | SRS_HTTP_PARSER=RESERVED | 21 | SRS_HTTP_PARSER=RESERVED |
| 21 | SRS_HTTP_CALLBACK=RESERVED | 22 | SRS_HTTP_CALLBACK=RESERVED |
| 22 | SRS_HTTP_SERVER=RESERVED | 23 | SRS_HTTP_SERVER=RESERVED |
| 23 | SRS_HTTP_API=RESERVED | 24 | SRS_HTTP_API=RESERVED |
| 24 | -SRS_LIBRTMP=RESERVED # srs-librtmp | ||
| 25 | -SRS_BWTC=RESERVED # srs-bandwidth-test client | 25 | +SRS_LIBRTMP=RESERVED |
| 26 | +# srs-bandwidth-test client | ||
| 27 | +SRS_BWTC=RESERVED | ||
| 26 | SRS_RESEARCH=RESERVED | 28 | SRS_RESEARCH=RESERVED |
| 27 | SRS_UTEST=RESERVED | 29 | SRS_UTEST=RESERVED |
| 28 | -SRS_GPERF=RESERVED # tcmalloc | ||
| 29 | -SRS_GPERF_MC=RESERVED # gperf memory check | ||
| 30 | -SRS_GPERF_MP=RESERVED # gperf memory profile | ||
| 31 | -SRS_GPERF_CP=RESERVED # gperf cpu profile | ||
| 32 | -SRS_GPROF=RESERVED # gprof | ||
| 33 | -SRS_ARM_UBUNTU12=RESERVED # armhf(v7cpu) built on ubuntu12 | 30 | +# tcmalloc |
| 31 | +SRS_GPERF=RESERVED | ||
| 32 | +# gperf memory check | ||
| 33 | +SRS_GPERF_MC=RESERVED | ||
| 34 | +# gperf memory profile | ||
| 35 | +SRS_GPERF_MP=RESERVED | ||
| 36 | +# gperf cpu profile | ||
| 37 | +SRS_GPERF_CP=RESERVED | ||
| 38 | +# gprof | ||
| 39 | +SRS_GPROF=RESERVED | ||
| 40 | +# armhf(v7cpu) built on ubuntu12 | ||
| 41 | +SRS_ARM_UBUNTU12=RESERVED | ||
| 42 | +# | ||
| 34 | # arguments | 43 | # arguments |
| 35 | SRS_PREFIX=/usr/local/srs | 44 | SRS_PREFIX=/usr/local/srs |
| 36 | SRS_JOBS=1 | 45 | SRS_JOBS=1 |
| 37 | SRS_STATIC=RESERVED | 46 | SRS_STATIC=RESERVED |
| 38 | SRS_HTTP_PARSER=NO | 47 | SRS_HTTP_PARSER=NO |
| 48 | +# | ||
| 39 | # private internal | 49 | # private internal |
| 40 | # dev, open all features for dev, no gperf/prof/arm. | 50 | # dev, open all features for dev, no gperf/prof/arm. |
| 41 | SRS_DEV=NO | 51 | SRS_DEV=NO |
| @@ -165,7 +175,7 @@ fi | @@ -165,7 +175,7 @@ fi | ||
| 165 | # if dev specified, open features if possible. | 175 | # if dev specified, open features if possible. |
| 166 | if [ $SRS_DEV = YES ]; then | 176 | if [ $SRS_DEV = YES ]; then |
| 167 | SRS_HLS=YES | 177 | SRS_HLS=YES |
| 168 | - SRS_NGINX=YES | 178 | + SRS_NGINX=NO |
| 169 | SRS_SSL=YES | 179 | SRS_SSL=YES |
| 170 | SRS_FFMPEG=YES | 180 | SRS_FFMPEG=YES |
| 171 | SRS_HTTP_CALLBACK=YES | 181 | SRS_HTTP_CALLBACK=YES |
| @@ -499,18 +499,14 @@ echo "" | @@ -499,18 +499,14 @@ echo "" | ||
| 499 | echo "configure summary:" | 499 | echo "configure summary:" |
| 500 | echo " ${SRS_CONFIGURE}" | 500 | echo " ${SRS_CONFIGURE}" |
| 501 | if [ $SRS_HLS = YES ]; then | 501 | if [ $SRS_HLS = YES ]; then |
| 502 | - echo -e "${GREEN}HLS over nginx is enabled${BLACK}" | 502 | + echo -e "${GREEN}HLS is enabled${BLACK}" |
| 503 | else | 503 | else |
| 504 | echo -e "${YELLOW}warning: without HLS support${BLACK}" | 504 | echo -e "${YELLOW}warning: without HLS support${BLACK}" |
| 505 | fi | 505 | fi |
| 506 | if [ $SRS_NGINX = YES ]; then | 506 | if [ $SRS_NGINX = YES ]; then |
| 507 | echo -e "${GREEN}Nginx http server is enabled${BLACK}" | 507 | echo -e "${GREEN}Nginx http server is enabled${BLACK}" |
| 508 | else | 508 | else |
| 509 | - if [ $SRS_HLS = YES ]; then | ||
| 510 | - echo -e "${YELLOW}warning: HLS without Nginx support${BLACK}" | ||
| 511 | - else | ||
| 512 | - echo -e "${GREEN}note: HLS without Nginx support${BLACK}" | ||
| 513 | - fi | 509 | + echo -e "${GREEN}note: Nginx http server is disabled${BLACK}" |
| 514 | fi | 510 | fi |
| 515 | if [ $SRS_SSL = YES ]; then | 511 | if [ $SRS_SSL = YES ]; then |
| 516 | echo -e "${GREEN}rtmp complex handshake is enabled${BLACK}" | 512 | echo -e "${GREEN}rtmp complex handshake is enabled${BLACK}" |
-
请 注册 或 登录 后发表评论