diff --git a/trunk/configure b/trunk/configure index df5ca6720..183fe7dd9 100755 --- a/trunk/configure +++ b/trunk/configure @@ -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 # the link options, always use static link 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 # TODO: FIXME: remove static. if [ $SRS_STATIC = YES ]; then SrsLinkOptions="${SrsLinkOptions} -static"; fi diff --git a/trunk/research/librtmp/Makefile b/trunk/research/librtmp/Makefile index 9a5aefd76..752113f41 100755 --- a/trunk/research/librtmp/Makefile +++ b/trunk/research/librtmp/Makefile @@ -70,6 +70,9 @@ endif ifeq ($(HANDSHAKE), SSL) SRS_LIBSSL_L = $(SRS_OBJS)/openssl/lib/libssl.a $(SRS_OBJS)/openssl/lib/libcrypto.a endif +ifneq ($(shell test -f $(SRS_OBJS)/openssl/lib/libssl.a && echo yes), yes) + SRS_LIBSSL_L = -lssl -lcrypto +endif ssl: @mkdir -p objs