remove -lssl for asterisk, and add it for res_osp (issue #6496, different patch)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10323 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 04ea7bc..b6a5bbf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -419,8 +419,6 @@ else
   HAVEDOT=no
 endif
 
-LIBS+=-lssl
-
 INSTALL=install
 
 CFLAGS+=-DT38_SUPPORT

diff --git a/res/Makefile b/res/Makefile
index 3b156f2..2759f4e 100644 (file)
--- a/res/Makefile
+++ b/res/Makefile
@@ -24,6 +24,7 @@ endif
 
 ifeq ($(NOCRYPTO),yes)
   MODS:=$(filter-out res_crypto.so,$(MODS))
+  MODS:=$(filter-out res_osp.so,$(MODS))
 endif
 
 OSPLIB:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a)
@@ -96,7 +97,7 @@ res_odbc.so: res_odbc.o
        $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc
 
 res_osp.so: res_osp.o $(OSPLIB)
-       $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(OSPLIB)
+       $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(OSPLIB) $(CRYPTO_LIBS)
 
 %.so : %.o
        $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}