From 45abc8d70d0bf6ad80c0e698f8c7fb04e6564f19 Mon Sep 17 00:00:00 2001 From: Nathan Whitehorn Date: Thu, 30 Sep 2004 21:24:20 +0000 Subject: [PATCH] Added SSL compilation support by defining USESSL as an environment variable. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9126 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../inbound_protocols/imap/Jamfile | 19 +++++++++++-------- .../inbound_protocols/pop3/Jamfile | 19 +++++++++++-------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile index 1ed16849c4..4a38d2b9ba 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile +++ b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile @@ -6,20 +6,23 @@ SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ; SubDirC++Flags -DBONE ; -#OpenSSL testing should be automated somehow -#SubDirC++Flags -DBONE -DUSESSL ; -#SubDirHdrs [ FDirName / boot home config include ] ; +if $(USESSL) { + SubDirC++Flags -DBONE -DUSESSL ; + SubDirHdrs [ FDirName / boot home config include ] ; +} Addon IMAP : mail_daemon inbound_protocols : imap_client.cpp imap_config.cpp NestedString.cpp ; -LinkSharedOSLibs IMAP : - be libmail.so socket bind ; - -#LinkSharedOSLibs IMAP : -# be libmail.so socket bind ssl crypto ; +if $(USESSL) { + LinkSharedOSLibs IMAP : + be libmail.so socket bind ssl crypto ; +} else { + LinkSharedOSLibs IMAP : + be libmail.so socket bind ; +} Package haiku-maildaemon-cvs : IMAP : diff --git a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile index f4f8cf5810..5d10c6f55f 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile +++ b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile @@ -5,9 +5,10 @@ SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ; SubDirC++Flags -DBONE ; -#OpenSSL testing should be automated somehow -#SubDirC++Flags -DBONE -DUSESSL ; -#SubDirHdrs [ FDirName / boot home config include ] ; +if $(USESSL) { + SubDirC++Flags -DBONE -DUSESSL ; + SubDirHdrs [ FDirName / boot home config include ] ; +} Addon POP3 : mail_daemon inbound_protocols : MessageIO.cpp @@ -15,11 +16,13 @@ Addon POP3 : mail_daemon inbound_protocols : SimpleMailProtocol.cpp md5c.c ; -LinkSharedOSLibs POP3 : - be libmail.so socket bind ; - -#LinkSharedOSLibs POP3 : -# be libmail.so socket bind ssl crypto ; +if $(USESSL) { + LinkSharedOSLibs POP3 : + be libmail.so socket bind ssl crypto ; +} else { + LinkSharedOSLibs POP3 : + be libmail.so socket bind ; +} Package haiku-maildaemon-cvs : POP3 :