Merge branch '2.0release' into develop

@@ -129,7 +129,7 @@ if [ $SRS_GPERF = YES ]; then LibGperfRoot="${SRS_OBJS_DIR}/gperf/include"; LibG
 if [ $SRS_GPERF_MD = YES ]; then LibGperfFile="${SRS_OBJS_DIR}/gperf/lib/libtcmalloc_debug.a"; fi
 if [ $SRS_GPERF_MD = YES ]; then LibGperfFile="${SRS_OBJS_DIR}/gperf/lib/libtcmalloc_debug.a"; fi
 # the link options, always use static link
 # the link options, always use static link
 SrsLinkOptions="-ldl"; 
 SrsLinkOptions="-ldl"; 
-if [ $SRS_SSL = YES ]; then if [ $SRS_USE_SYS_SSL = YES ]; then SrsLinkOptions="${SrsLinkOptions} -lssl"; fi fi
+if [ $SRS_SSL = YES ]; then if [ $SRS_USE_SYS_SSL = YES ]; then SrsLinkOptions="${SrsLinkOptions} -lssl -lcrypto"; fi fi
 # if static specified, add static
 # if static specified, add static
 # TODO: FIXME: remove static.
 # TODO: FIXME: remove static.
 if [ $SRS_STATIC = YES ]; then SrsLinkOptions="${SrsLinkOptions} -static"; fi
 if [ $SRS_STATIC = YES ]; then SrsLinkOptions="${SrsLinkOptions} -static"; fi

@@ -70,6 +70,9 @@ endif
 ifeq ($(HANDSHAKE), SSL)
 ifeq ($(HANDSHAKE), SSL)
     SRS_LIBSSL_L = $(SRS_OBJS)/openssl/lib/libssl.a $(SRS_OBJS)/openssl/lib/libcrypto.a
     SRS_LIBSSL_L = $(SRS_OBJS)/openssl/lib/libssl.a $(SRS_OBJS)/openssl/lib/libcrypto.a
 endif
 endif
+ifneq ($(shell test -f $(SRS_OBJS)/openssl/lib/libssl.a && echo yes), yes)
+    SRS_LIBSSL_L = -lssl -lcrypto
+endif
 
 
 ssl:
 ssl:
 	@mkdir -p objs
 	@mkdir -p objs