winlin

fix bug for default configure

@@ -63,6 +63,13 @@ function Ubuntu_prepare() @@ -63,6 +63,13 @@ function Ubuntu_prepare()
63 echo "install make success" 63 echo "install make success"
64 fi 64 fi
65 65
  66 + patch --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
  67 + echo "install patch"
  68 + require_sudoer "sudo apt-get install -y --force-yes patch"
  69 + sudo apt-get install -y --force-yes patch; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
  70 + echo "install patch success"
  71 + fi
  72 +
66 autoconf --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 73 autoconf --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
67 echo "install autoconf" 74 echo "install autoconf"
68 require_sudoer "sudo apt-get install -y --force-yes autoconf" 75 require_sudoer "sudo apt-get install -y --force-yes autoconf"
@@ -146,6 +153,13 @@ function Centos_prepare() @@ -146,6 +153,13 @@ function Centos_prepare()
146 echo "install make success" 153 echo "install make success"
147 fi 154 fi
148 155
  156 + patch --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
  157 + echo "install patch"
  158 + require_sudoer "sudo yum install -y patch"
  159 + sudo yum install -y patch; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi
  160 + echo "install patch success"
  161 + fi
  162 +
149 automake --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then 163 automake --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then
150 echo "install automake" 164 echo "install automake"
151 require_sudoer "sudo yum install -y automake" 165 require_sudoer "sudo yum install -y automake"
@@ -133,14 +133,6 @@ done @@ -133,14 +133,6 @@ done
133 ##################################################################################### 133 #####################################################################################
134 # apply the default value when user donot specified. 134 # apply the default value when user donot specified.
135 ##################################################################################### 135 #####################################################################################
136 -# if http-xxxx specified, open the SRS_HTTP_PARSER  
137 -__compile_http_parser=NO  
138 -if [ $SRS_HTTP_CALLBACK = YES ]; then SRS_HTTP_PARSER=YES;__compile_http_parser=YES; fi  
139 -if [ $SRS_HTTP_SERVER = YES ]; then SRS_HTTP_PARSER=YES;__compile_http_parser=YES; fi  
140 -if [ $SRS_HTTP_API = YES ]; then SRS_HTTP_PARSER=YES;__compile_http_parser=YES; fi  
141 -# if no http specified, disable http parser  
142 -if [ $__compile_http_parser = NO ]; then SRS_HTTP_PARSER=NO; fi  
143 -  
144 # if transcode specified, try ffmpeg if possible. 136 # if transcode specified, try ffmpeg if possible.
145 if [ $SRS_TRANSCODE = YES ]; then if [ $SRS_FFMPEG_TOOL = RESERVED ]; then SRS_FFMPEG_TOOL=YES; fi fi 137 if [ $SRS_TRANSCODE = YES ]; then if [ $SRS_FFMPEG_TOOL = RESERVED ]; then SRS_FFMPEG_TOOL=YES; fi fi
146 if [ $SRS_INGEST = YES ]; then if [ $SRS_FFMPEG_TOOL = RESERVED ]; then SRS_FFMPEG_TOOL=YES; fi fi 138 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 @@ -254,6 +246,12 @@ if [ $SRS_PI = YES ]; then
254 SRS_STATIC=YES 246 SRS_STATIC=YES
255 fi 247 fi
256 248
  249 +# if http-xxxx specified, open the SRS_HTTP_PARSER
  250 +SRS_HTTP_PARSER=NO
  251 +if [ $SRS_HTTP_CALLBACK = YES ]; then SRS_HTTP_PARSER=YES; fi
  252 +if [ $SRS_HTTP_SERVER = YES ]; then SRS_HTTP_PARSER=YES; fi
  253 +if [ $SRS_HTTP_API = YES ]; then SRS_HTTP_PARSER=YES; fi
  254 +
257 # parse the jobs for make 255 # parse the jobs for make
258 if [[ "" -eq SRS_JOBS ]]; then 256 if [[ "" -eq SRS_JOBS ]]; then
259 export SRS_JOBS="--jobs" 257 export SRS_JOBS="--jobs"