refine option, add --use-sys-ssl, change to 0.9.67

@@ -469,6 +469,9 @@ fi
 # Affected users should upgrade to OpenSSL 1.0.1g. Users unable to immediately
 # Affected users should upgrade to OpenSSL 1.0.1g. Users unable to immediately
 # upgrade can alternatively recompile OpenSSL with -DOPENSSL_NO_HEARTBEATS.
 # upgrade can alternatively recompile OpenSSL with -DOPENSSL_NO_HEARTBEATS.
 if [ $SRS_SSL = YES ]; then
 if [ $SRS_SSL = YES ]; then
+    if [ $SRS_USE_SYS_SSL = YES ]; then
+        echo "warning: donot compile ssl, use system ssl"
+    else
         # check the arm flag file, if flag changed, need to rebuild the st.
         # check the arm flag file, if flag changed, need to rebuild the st.
         if [ $SRS_ARM_UBUNTU12 = YES ]; then
         if [ $SRS_ARM_UBUNTU12 = YES ]; then
             # ok, arm specified, if the flag filed does not exists, need to rebuild.
             # ok, arm specified, if the flag filed does not exists, need to rebuild.
@@ -506,6 +509,7 @@ if [ $SRS_SSL = YES ]; then
         # check status
         # check status
         ret=$?; if [[ $ret -ne 0 ]]; then echo "build openssl-1.0.1f failed, ret=$ret"; exit $ret; fi
         ret=$?; if [[ $ret -ne 0 ]]; then echo "build openssl-1.0.1f failed, ret=$ret"; exit $ret; fi
         if [ ! -f ${SRS_OBJS}/openssl/lib/libssl.a ]; then echo "build openssl-1.0.1f failed."; exit -1; fi
         if [ ! -f ${SRS_OBJS}/openssl/lib/libssl.a ]; then echo "build openssl-1.0.1f failed."; exit -1; fi
+    fi
 fi
 fi
 
 
 if [ $SRS_SSL = YES ]; then
 if [ $SRS_SSL = YES ]; then

@@ -47,6 +47,10 @@ SRS_PREFIX=/usr/local/srs
 SRS_JOBS=1
 SRS_JOBS=1
 SRS_STATIC=RESERVED
 SRS_STATIC=RESERVED
 #
 #
+# experts
+# donot compile ssl, use system ssl(-lssl) if required.
+SRS_USE_SYS_SSL=NO
+#
 # presets
 # presets
 # for x86/x64 pc/servers
 # for x86/x64 pc/servers
 SRS_X86_X64=NO
 SRS_X86_X64=NO
@@ -143,6 +147,9 @@ Conflicts:
   4. --arm vs --with-ffmpeg/bwtc/gperf/gmc/gmp/gprof:
   4. --arm vs --with-ffmpeg/bwtc/gperf/gmc/gmp/gprof:
         the complex tools not available for arm.
         the complex tools not available for arm.
 
 
+Experts:
+  --use-sys-ssl             donot compile ssl, use system ssl(-lssl) if required.
+
 Workflow:
 Workflow:
   1. apply "Presets". if not specified, use default preset.
   1. apply "Presets". if not specified, use default preset.
   2. apply "Options". user specified option will override the preset.
   2. apply "Options". user specified option will override the preset.
@@ -211,6 +218,8 @@ function parse_user_option() {
         --pure-rtmp)                    SRS_PURE_RTMP=YES           ;;
         --pure-rtmp)                    SRS_PURE_RTMP=YES           ;;
         --rtmp-hls)                     SRS_RTMP_HLS=YES            ;;
         --rtmp-hls)                     SRS_RTMP_HLS=YES            ;;
         
         
+        --use-sys-ssl)                  SRS_USE_SYS_SSL=YES         ;;
+
         *)
         *)
             echo "$0: error: invalid option \"$option\""
             echo "$0: error: invalid option \"$option\""
             exit 1
             exit 1

@@ -396,12 +396,14 @@ LibHttpParserRoot=""; LibHttpParserfile=""
 if [ $SRS_HTTP_PARSER = YES ]; then LibHttpParserRoot="${SRS_OBJS}/hp"; LibHttpParserfile="${LibHttpParserRoot}/libhttp_parser.a"; fi
 if [ $SRS_HTTP_PARSER = YES ]; then LibHttpParserRoot="${SRS_OBJS}/hp"; LibHttpParserfile="${LibHttpParserRoot}/libhttp_parser.a"; fi
 # openssl-1.0.1f, for the RTMP complex handshake.
 # openssl-1.0.1f, for the RTMP complex handshake.
 LibSSLRoot="";LibSSLfile=""
 LibSSLRoot="";LibSSLfile=""
-if [ $SRS_SSL = YES ]; then LibSSLRoot="${SRS_OBJS}/openssl/include"; LibSSLfile="${SRS_OBJS}/openssl/lib/libssl.a ${SRS_OBJS}/openssl/lib/libcrypto.a"; fi
+if [ $SRS_SSL = YES ]; then if [ $SRS_USE_SYS_SSL = NO ]; then LibSSLRoot="${SRS_OBJS}/openssl/include"; LibSSLfile="${SRS_OBJS}/openssl/lib/libssl.a ${SRS_OBJS}/openssl/lib/libcrypto.a"; fi fi
 # gperftools-2.1, for mem check and mem/cpu profile
 # gperftools-2.1, for mem check and mem/cpu profile
 LibGperfRoot=""; LibGperfFile=""
 LibGperfRoot=""; LibGperfFile=""
 if [ $SRS_GPERF = YES ]; then LibGperfRoot="${SRS_OBJS}/gperf/include"; LibGperfFile="${SRS_OBJS}/gperf/lib/libtcmalloc_and_profiler.a"; fi
 if [ $SRS_GPERF = YES ]; then LibGperfRoot="${SRS_OBJS}/gperf/include"; LibGperfFile="${SRS_OBJS}/gperf/lib/libtcmalloc_and_profiler.a"; fi
 # the link options, always use static link
 # the link options, always use static link
-SrsLinkOptions=""; if [ $SRS_STATIC = YES ]; then SrsLinkOptions="-static"; else SrsLinkOptions="-ldl"; fi
+SrsLinkOptions=""; 
+if [ $SRS_SSL = YES ]; then if [ $SRS_USE_SYS_SSL = YES ]; then SrsLinkOptions="-lssl"; fi fi
+if [ $SRS_STATIC = YES ]; then SrsLinkOptions="${SrsLinkOptions} -static"; else SrsLinkOptions="${SrsLinkOptions} -ldl"; fi
 
 
 #####################################################################################
 #####################################################################################
 # Modules, compile each module, then link to binary
 # Modules, compile each module, then link to binary

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 // current release version
 #define VERSION_MAJOR "0"
 #define VERSION_MAJOR "0"
 #define VERSION_MINOR "9"
 #define VERSION_MINOR "9"
-#define VERSION_REVISION "66"
+#define VERSION_REVISION "67"
 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
 // server info.
 // server info.
 #define RTMP_SIG_SRS_KEY "srs"
 #define RTMP_SIG_SRS_KEY "srs"