From 6859fd3652fa18742130fb590ca9910bae93ea79 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 23 Oct 2012 10:30:05 -0400 Subject: [PATCH] Do not automatically depend on libcrypto and make fallback dependency on libssl optional --- SoObjects/SOGo/GNUmakefile.preamble | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/SoObjects/SOGo/GNUmakefile.preamble b/SoObjects/SOGo/GNUmakefile.preamble index fe6645567..6e01a3b92 100644 --- a/SoObjects/SOGo/GNUmakefile.preamble +++ b/SoObjects/SOGo/GNUmakefile.preamble @@ -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)