[svn-commits] trunk r10323 - in /trunk: Makefile res/Makefile

[svn-commits at lists.digium.com]

Author: russell
Date: Thu Feb 16 14:38:21 2006
New Revision: 10323

URL: http://svn.digium.com/view/asterisk?rev=10323&view=rev
Log:
remove -lssl for asterisk, and add it for res_osp (issue #6496, different patch)

Modified:
    trunk/Makefile
    trunk/res/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=10323&r1=10322&r2=10323&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Feb 16 14:38:21 2006
@@ -418,8 +418,6 @@
 else
   HAVEDOT=no
 endif
-
-LIBS+=-lssl
 
 INSTALL=install
 

Modified: trunk/res/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/res/Makefile?rev=10323&r1=10322&r2=10323&view=diff
==============================================================================
--- trunk/res/Makefile (original)
+++ trunk/res/Makefile Thu Feb 16 14:38:21 2006
@@ -24,6 +24,7 @@
 
 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 @@
 	$(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}