From 938f7ddc0fa00cd36cd8675e3d1fe9dc239d4ed3 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 16 Feb 2006 20:38:21 +0000
Subject: 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
---
 Makefile     | 2 --
 res/Makefile | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 04ea7bc8e..b6a5bbf16 100644
--- 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 3b156f2e7..2759f4e49 100644
--- 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}
-- 
cgit v1.2.3