Merge branch '4.0release' into develop

4 years ago · 8580b1e5fb
parent bfa156247c f8266fe3b7
commit 8580b1e5fb
1 changed files with 1 additions and 0 deletions
--- a/trunk/auto/options.sh
+++ b/trunk/auto/options.sh
@ -154,6 +154,7 @@ Features:
  --stat=on|off             Whether build the the data statistic, for http api.
  --librtmp=on|off          Whether build the srs-librtmp, library for client.
  --research=on|off         Whether build the research tools.
+  --cherrypy=on|off         Whether install CherryPy for demo api-server.
  --utest=on|off            Whether build the utest for SRS.
  --srt=on|off              Whether build the SRT support for SRS.
  --rtc=on|off              Whether build the WebRTC support for SRS.