diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 07716b7f6..e19bfc9f4 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -568,12 +568,11 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then if [[ -f ${SRS_OBJS}/CherryPy-3.2.4/setup.py ]]; then echo "CherryPy-3.2.4 is ok."; else - require_sudoer "install CherryPy-3.2.4" echo "Installing CherryPy-3.2.4"; ( - sudo rm -rf ${SRS_OBJS}/CherryPy-3.2.4 && cd ${SRS_OBJS} && + rm -rf ${SRS_OBJS}/CherryPy-3.2.4 && cd ${SRS_OBJS} && unzip -q ../3rdparty/CherryPy-3.2.4.zip && cd CherryPy-3.2.4 && - sudo python setup.py install + python setup.py install --user ) fi # check status diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 92b8bea04..dd8959095 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -15,13 +15,13 @@ help=no ################################################################ # feature options -SRS_HDS=RESERVED -SRS_NGINX=RESERVED -SRS_FFMPEG_TOOL=RESERVED -SRS_KAFKA=RESERVED -SRS_LIBRTMP=RESERVED -SRS_RESEARCH=RESERVED -SRS_UTEST=RESERVED +SRS_HDS=NO +SRS_NGINX=NO +SRS_FFMPEG_TOOL=NO +SRS_KAFKA=NO +SRS_LIBRTMP=NO +SRS_RESEARCH=YES +SRS_UTEST=YES SRS_GPERF=NO # Performance test: tcmalloc SRS_GPERF_MC=NO # Performance test: gperf memory check SRS_GPERF_MD=NO # Performance test: gperf memory defence