From ad87bd7cf2f4e8ceeec9a395b3d2731a545753d6 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 1 Mar 2017 09:21:20 +0800
Subject: [PATCH] Refine configure

---
 trunk/auto/libs.sh                 | 2 +-
 trunk/configure                    | 9 ++++++++-
 trunk/src/libs/srs_librtmp.hpp     | 2 +-
 trunk/src/main/srs_main_server.cpp | 9 ++-------
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/trunk/auto/libs.sh b/trunk/auto/libs.sh
index 1a93bbb88..89f4e8ccd 100755
--- a/trunk/auto/libs.sh
+++ b/trunk/auto/libs.sh
@@ -41,7 +41,7 @@ echo -n "	@bash auto/generate_header.sh ${SRS_OBJS_DIR}" >> ${FILE}
 echo "" >> ${FILE}
 
 # archive librtmp.a
-echo -n "	\$(AR) -rs ${LIB_TAGET_STATIC} " >> ${FILE}
+echo -n "	\$(AR) \$(ARFLAGS) ${LIB_TAGET_STATIC} " >> ${FILE}
 for item in ${MODULE_OBJS[*]}; do
     FILE_NAME=`basename $item`
     FILE_NAME=${FILE_NAME%.*}
diff --git a/trunk/configure b/trunk/configure
index 1fc2fc105..e2b432514 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -95,17 +95,24 @@ CppStd="-ansi"
 if [[ $SRS_EXPORT_LIBRTMP_PROJECT == YES ]]; then
     LibraryCompile=" -fPIC"
 fi
+# For MacOS, disable the link warnings:
+#       srs_librtmp.a(srs_kernel_io.o) unable to open object file: No such file or directory
+if [[ $SRS_OSX == YES ]]; then
+    CxxMacOS=" -D GCC_GENERATE_DEBUGGING_SYMBOLS=no"
+fi
 # performance of gprof
 SrsGprof=""; SrsGprofLink=""; if [ $SRS_GPROF = YES ]; then SrsGprof=" -pg -lc_p"; SrsGprofLink=" -pg"; fi
 # performance of gperf
 SrsGperf=""; SrsGperfLink=""; if [ $SRS_GPERF = YES ]; then SrsGperfLink=" -lpthread"; fi
 # the cxx flag generated.
-CXXFLAGS="${CppStd}${WarnLevel}${GDBDebug}${LibraryCompile}${SrsGprof}"
+CXXFLAGS="${CppStd}${WarnLevel}${GDBDebug}${LibraryCompile}${SrsGprof}${CxxMacOS}"
 if [ $SRS_GPERF = YES ]; then CXXFLAGS="${CXXFLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free"; fi
+# Start to generate the Makefile.
 cat << END > ${SRS_OBJS}/${SRS_MAKEFILE}
 GCC = gcc
 CXX = g++
 AR = ar
+ARFLAGS = -rs
 LINK = g++
 CXXFLAGS = ${CXXFLAGS}
 
diff --git a/trunk/src/libs/srs_librtmp.hpp b/trunk/src/libs/srs_librtmp.hpp
index e9a8fec08..6c12634dd 100644
--- a/trunk/src/libs/srs_librtmp.hpp
+++ b/trunk/src/libs/srs_librtmp.hpp
@@ -1230,7 +1230,7 @@ typedef void* srs_hijack_io_t;
 
 /*************************************************************
  *************************************************************
- * Deprecated APIs.
+ * Deprecated APIs, maybe removed in future versions.
  *************************************************************
  *************************************************************/
 /**
diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp
index d2702ecbe..d5d5aa905 100644
--- a/trunk/src/main/srs_main_server.cpp
+++ b/trunk/src/main/srs_main_server.cpp
@@ -341,14 +341,9 @@ void show_macro_features()
     srs_warn("srs memory watcher will hurts performance. user should kill by SIGTERM or init.d script.");
 #endif
     
-#if defined(SRS_AUTO_STREAM_CASTER)
-#warning "stream caster is experiment feature."
-    srs_warn("stream caster is experiment feature.");
-#endif
-    
 #if VERSION_MAJOR > VERSION_STABLE
-#warning "current branch is not stable, please use stable branch instead."
-    srs_warn("SRS %s is not stable, please use stable branch %s instead", RTMP_SIG_SRS_VERSION, VERSION_STABLE_BRANCH);
+#warning "Current branch is unstable."
+    srs_warn("Develop is unstable, please use branch: git checkout %s", VERSION_STABLE_BRANCH);
 #endif
     
 #if defined(SRS_PERF_SO_SNDBUF_SIZE) && !defined(SRS_PERF_MW_SO_SNDBUF)