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

for bug #155, refine for osx, with ssl/http, disable statistics. 0.9.198.

Browse source
This commit is contained in:
winlin 2014-08-17 20:38:51 +08:00
parent 554a9763db
commit 3111870316
5 changed files with 55 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
trunk/auto/options.sh Executable file → Normal file
View file

@ -593,11 +593,11 @@ function apply_user_presets() {
SRS_SSL=YES
SRS_FFMPEG_TOOL=NO
SRS_TRANSCODE=YES
SRS_INGEST=NO
SRS_HTTP_PARSER=NO
SRS_HTTP_CALLBACK=NO
SRS_HTTP_SERVER=NO
SRS_HTTP_API=NO
SRS_INGEST=YES
SRS_HTTP_PARSER=YES
SRS_HTTP_CALLBACK=YES
SRS_HTTP_SERVER=YES
SRS_HTTP_API=YES
SRS_LIBRTMP=NO
SRS_RESEARCH=NO
SRS_UTEST=NO
@ -794,6 +794,21 @@ function check_option_conflicts() {
echo "x86/x64 should never use static, see: ./configure --help"; __check_ok=NO;
fi
fi
# for darwin, must use --osx, vice versa
if [ $SRS_OSX = YES ]; then
if [ `uname -s` = Darwin ]; then
echo "osx(darwin) is ok"
else
echo "--osx is for darwin(your os is not), see: ./configure --help"; __check_ok=NO;
fi
else
if [ `uname -s` = Darwin ]; then
echo "use --osx for darwin, see: ./configure --help"; __check_ok=NO;
fi
fi
# TODO: FIXME: check more os.
# check variable neccessary
if [ $SRS_HLS = RESERVED ]; then echo "you must specifies the hls, see: ./configure --help"; __check_ok=NO; fi