diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 58765a471..e3dc57bbc 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -143,12 +143,12 @@ Presets: --pi for raspberry-pi(directly build), open features hls/ssl/static. --arm alias for --with-arm-ubuntu12 --mips alias for --with-mips-ubuntu12 - --dev for dev, open all features, no gperf/gprof/arm. --fast the most fast compile, nothing, only support vp6 RTMP. --pure-rtmp only support RTMP with ssl. --rtmp-hls only support RTMP+HLS with ssl. --disable-all disable all features, only support vp6 RTMP. - --full enable all features. + --dev for dev, open all features, no nginx/gperf/gprof/arm. + --full enable all features, no gperf/gprof/arm. Conflicts: 1. --with-gmc vs --with-gmp: diff --git a/trunk/scripts/test_configure.sh b/trunk/scripts/test_configure.sh index c2e2aa342..8a1a8507c 100755 --- a/trunk/scripts/test_configure.sh +++ b/trunk/scripts/test_configure.sh @@ -182,4 +182,10 @@ ok_msg "test \" ${item} \"" ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" +item="./configure --full" +ok_msg "test \" ${item} \"" +(./configure --dev && make) >>$log 2>&1 +ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi +ok_msg "test \" ${item} \" success" + echo "success"