Do not automatically depend on libcrypto and make fallback dependency on libssl optional

This commit is contained in:
Wolfgang Sourdeau
2012-10-23 10:30:05 -04:00
parent 2f9369db57
commit 6859fd3652
+2 -8
View File
@@ -24,22 +24,16 @@ SOGo_LIBRARIES_DEPEND_UPON += \
-lNGStreams -lNGExtensions -lEOControl \
-lDOM -lSaxObjC \
-lNGLdap -lSBJson \
-lGDLContentStore -lcrypto -lgnustep-base -lobjc -ldl
-lGDLContentStore -lgnustep-base -lobjc -ldl
ifeq ($(HAS_LIBRARY_gnutls),yes)
ADDITIONAL_CPPFLAGS += -DHAVE_GNUTLS=1
SOGo_LIBRARIES_DEPEND_UPON += -lgnutls
else
ifeq ($(HAS_LIBRARY_ssl),yes)
ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1
SOGo_LIBRARIES_DEPEND_UPON += -lcrypto
endif
ifeq ($(HAS_LIBRARY_gnutls),yes)
ADDITIONAL_CPPFLAGS += -DHAVE_GNUTLS=1
SOGo_LIBRARIES_DEPEND_UPON += -lgnutls
else
ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1
SOGo_LIBRARIES_DEPEND_UPON += -lcrypto
endif
ifeq ($(findstring openbsd, $(GNUSTEP_HOST_OS)), openbsd)