From 98924943a62ca082a90ab71d0dc3ba01300a5208 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 24 Jun 2020 17:03:56 +0800
Subject: [PATCH] Build: Refine the options for configure

---
 trunk/auto/options.sh | 19 +++----------------
 trunk/configure       | 12 ++++++------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh
index f0b9e56c0..39599e082 100755
--- a/trunk/auto/options.sh
+++ b/trunk/auto/options.sh
@@ -203,8 +203,7 @@ Experts:
   --use-shared-st                   Use link shared libraries for ST which uses MPL license.
   --use-shared-srt                  Use link shared libraries for SRT which uses MPL license.
   --build-tag=<TAG>                 Set the build object directory suffix.
-  --with-clean                      Configure SRS and do make clean if possible.
-  --without-clean                   Configure SRS and never make clean even possible.
+  --clean=on|off                    Whether do 'make clean' when configure.
   --detect-sendmmsg=on|off          Whether detect the sendmmsg API.
   --has-sendmmsg=on|off             Whether OS supports sendmmsg API.
   --simulator=on|off                Whether enable RTC network simulator.
@@ -437,7 +436,7 @@ if [ $help = yes ]; then
     exit 0
 fi
 
-function apply_user_presets() {
+function apply_detail_options() {
     # always set the log level for all presets.
     SRS_LOG_VERBOSE=NO
     SRS_LOG_INFO=NO
@@ -536,19 +535,7 @@ function apply_user_presets() {
     if [[ $SRS_RTC == YES && $SRS_FFMPEG_FIT == RESERVED ]]; then
         SRS_FFMPEG_FIT=YES
     fi
-}
-apply_user_presets
 
-#####################################################################################
-# parse detail feature options
-#####################################################################################
-for option
-do
-    parse_user_option_to_value_and_option
-    parse_user_option
-done
-
-function apply_user_detail_options() {
     # if transcode/ingest specified, requires the ffmpeg stub classes.
     SRS_FFMPEG_STUB=NO
     if [ $SRS_TRANSCODE = YES ]; then SRS_FFMPEG_STUB=YES; fi
@@ -611,7 +598,7 @@ function apply_user_detail_options() {
         SRS_SENDMMSG=NO
     fi
 }
-apply_user_detail_options
+apply_detail_options
 
 function regenerate_options() {
     # save all config options to macro to write to auto headers file
diff --git a/trunk/configure b/trunk/configure
index 20c6a1ed9..605fc2db8 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -499,13 +499,13 @@ destroy:
 	(cd ${SRS_OBJS_DIR} && rm -rf ${SRS_PLATFORM})
 
 clean_srs:
-	(cd ${SRS_OBJS_DIR} && rm -rf srs srs_utest)
-	(cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && rm -rf include/* lib/*)
-	(cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && find src -name "*.o" -delete)
-	(cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && find utest -name "*.o" -delete)
+	@(cd ${SRS_OBJS_DIR} && rm -rf srs srs_utest)
+	@(cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && rm -rf include/* lib/*)
+	@(cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && find src -name "*.o" -delete)
+	@(cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && find utest -name "*.o" -delete)
 
 clean_modules:
-	(cd ${SRS_OBJS_DIR} && rm -rf $__mdefaults)
+	@(cd ${SRS_OBJS_DIR} && rm -rf $__mdefaults)
 
 clean_openssl:
 	(cd ${SRS_OBJS_DIR}/${SRS_PLATFORM} && rm -rf openssl*)
@@ -783,7 +783,7 @@ done
 # Do cleanup when configure done.
 #####################################################################################
 if [[ $SRS_CLEAN == YES && -f Makefile ]]; then
-    echo "Do full cleanup, you can disable it by: --without-clean"
+    echo "Do full cleanup, you can disable it by: --clean=off"
     make clean
 fi