Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-04-16 12:37:19 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
cc338fdb7cd33ee85bc2868fe6767dc92f8617d7
cc338fdb
1 parent
005502a0
fix bug for default configure
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
20 行增加
和
8 行删除
trunk/auto/depends.sh
trunk/auto/options.sh
trunk/auto/depends.sh
查看文件 @
cc338fd
...
...
@@ -63,6 +63,13 @@ function Ubuntu_prepare()
echo
"install make success"
fi
patch --help >/dev/null 2>&1;
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
echo
"install patch"
require_sudoer
"sudo apt-get install -y --force-yes patch"
sudo apt-get install -y --force-yes patch;
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then return
$ret
;
fi
echo
"install patch success"
fi
autoconf --help >/dev/null 2>&1;
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
echo
"install autoconf"
require_sudoer
"sudo apt-get install -y --force-yes autoconf"
...
...
@@ -146,6 +153,13 @@ function Centos_prepare()
echo
"install make success"
fi
patch --help >/dev/null 2>&1;
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
echo
"install patch"
require_sudoer
"sudo yum install -y patch"
sudo yum install -y patch;
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then return
$ret
;
fi
echo
"install patch success"
fi
automake --help >/dev/null 2>&1;
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
echo
"install automake"
require_sudoer
"sudo yum install -y automake"
...
...
trunk/auto/options.sh
查看文件 @
cc338fd
...
...
@@ -133,14 +133,6 @@ done
#####################################################################################
# apply the default value when user donot specified.
#####################################################################################
# if http-xxxx specified, open the SRS_HTTP_PARSER
__compile_http_parser
=
NO
if
[
$SRS_HTTP_CALLBACK
=
YES
]
;
then
SRS_HTTP_PARSER
=
YES;__compile_http_parser
=
YES;
fi
if
[
$SRS_HTTP_SERVER
=
YES
]
;
then
SRS_HTTP_PARSER
=
YES;__compile_http_parser
=
YES;
fi
if
[
$SRS_HTTP_API
=
YES
]
;
then
SRS_HTTP_PARSER
=
YES;__compile_http_parser
=
YES;
fi
# if no http specified, disable http parser
if
[
$__compile_http_parser
=
NO
]
;
then
SRS_HTTP_PARSER
=
NO;
fi
# if transcode specified, try ffmpeg if possible.
if
[
$SRS_TRANSCODE
=
YES
]
;
then if
[
$SRS_FFMPEG_TOOL
=
RESERVED
]
;
then
SRS_FFMPEG_TOOL
=
YES;
fi fi
if
[
$SRS_INGEST
=
YES
]
;
then if
[
$SRS_FFMPEG_TOOL
=
RESERVED
]
;
then
SRS_FFMPEG_TOOL
=
YES;
fi fi
...
...
@@ -254,6 +246,12 @@ if [ $SRS_PI = YES ]; then
SRS_STATIC
=
YES
fi
# if http-xxxx specified, open the SRS_HTTP_PARSER
SRS_HTTP_PARSER
=
NO
if
[
$SRS_HTTP_CALLBACK
=
YES
]
;
then
SRS_HTTP_PARSER
=
YES;
fi
if
[
$SRS_HTTP_SERVER
=
YES
]
;
then
SRS_HTTP_PARSER
=
YES;
fi
if
[
$SRS_HTTP_API
=
YES
]
;
then
SRS_HTTP_PARSER
=
YES;
fi
# parse the jobs for make
if
[[
""
-eq SRS_JOBS
]]
;
then
export
SRS_JOBS
=
"--jobs"
...
...
请
注册
或
登录
后发表评论