From 5ff1d589f718209fedc2eb72416578c70c9f13c5 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 6 Apr 2014 19:19:13 +0800
Subject: [PATCH] change warn to trace for nginx disabled

---
 trunk/auto/options.sh | 28 +++++++++++++++++++---------
 trunk/configure       |  8 ++------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh
index 6870b0714..d0f2a3855 100755
--- a/trunk/auto/options.sh
+++ b/trunk/auto/options.sh
@@ -17,25 +17,35 @@ SRS_HLS=RESERVED
 SRS_NGINX=RESERVED
 SRS_SSL=RESERVED
 SRS_FFMPEG=RESERVED
+SRS_TRANSCODE=RESERVED
 SRS_HTTP_PARSER=RESERVED
 SRS_HTTP_CALLBACK=RESERVED
 SRS_HTTP_SERVER=RESERVED
 SRS_HTTP_API=RESERVED
-SRS_LIBRTMP=RESERVED # srs-librtmp
-SRS_BWTC=RESERVED # srs-bandwidth-test client
+SRS_LIBRTMP=RESERVED
+# srs-bandwidth-test client
+SRS_BWTC=RESERVED
 SRS_RESEARCH=RESERVED
 SRS_UTEST=RESERVED
-SRS_GPERF=RESERVED # tcmalloc
-SRS_GPERF_MC=RESERVED # gperf memory check
-SRS_GPERF_MP=RESERVED # gperf memory profile
-SRS_GPERF_CP=RESERVED # gperf cpu profile
-SRS_GPROF=RESERVED # gprof
-SRS_ARM_UBUNTU12=RESERVED # armhf(v7cpu) built on ubuntu12
+# tcmalloc
+SRS_GPERF=RESERVED
+# gperf memory check
+SRS_GPERF_MC=RESERVED
+# gperf memory profile
+SRS_GPERF_MP=RESERVED
+# gperf cpu profile
+SRS_GPERF_CP=RESERVED
+# gprof
+SRS_GPROF=RESERVED
+# armhf(v7cpu) built on ubuntu12
+SRS_ARM_UBUNTU12=RESERVED
+#
 # arguments
 SRS_PREFIX=/usr/local/srs
 SRS_JOBS=1
 SRS_STATIC=RESERVED
 SRS_HTTP_PARSER=NO
+#
 # private internal
 # dev, open all features for dev, no gperf/prof/arm.
 SRS_DEV=NO
@@ -165,7 +175,7 @@ fi
 # if dev specified, open features if possible.
 if [ $SRS_DEV = YES ]; then
     SRS_HLS=YES
-    SRS_NGINX=YES
+    SRS_NGINX=NO
     SRS_SSL=YES
     SRS_FFMPEG=YES
     SRS_HTTP_CALLBACK=YES
diff --git a/trunk/configure b/trunk/configure
index 1ed823418..3edb26b84 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -499,18 +499,14 @@ echo ""
 echo "configure summary:"
 echo "      ${SRS_CONFIGURE}"
 if [ $SRS_HLS = YES ]; then
-    echo -e "${GREEN}HLS over nginx is enabled${BLACK}"
+    echo -e "${GREEN}HLS is enabled${BLACK}"
 else
     echo -e "${YELLOW}warning: without HLS support${BLACK}"
 fi
 if [ $SRS_NGINX = YES ]; then
     echo -e "${GREEN}Nginx http server is enabled${BLACK}"
 else
-    if [ $SRS_HLS = YES ]; then
-        echo -e "${YELLOW}warning: HLS without Nginx support${BLACK}"
-    else
-        echo -e "${GREEN}note: HLS without Nginx support${BLACK}"
-    fi
+    echo -e "${GREEN}note: Nginx http server is disabled${BLACK}"
 fi
 if [ $SRS_SSL = YES ]; then
     echo -e "${GREEN}rtmp complex handshake is enabled${BLACK}"