IMAP: Remove direct usage of OpenSSL.

It already uses BSecureSocket without checking for USE_SSL,
so just assume we have SSL no matter what.
This commit is contained in:
Augustin Cavalier 2017-06-30 20:32:35 -04:00
parent 92bfd0e09e
commit 9980b6b47c
2 changed files with 3 additions and 19 deletions

View File

@ -57,15 +57,11 @@ ConfigView::ConfigView(const BMailAccountSettings& accountSettings,
| B_MAIL_PROTOCOL_HAS_PASSWORD | B_MAIL_PROTOCOL_HAS_HOSTNAME
| B_MAIL_PROTOCOL_CAN_LEAVE_MAIL_ON_SERVER
| B_MAIL_PROTOCOL_PARTIAL_DOWNLOAD
#ifdef USE_SSL
| B_MAIL_PROTOCOL_HAS_FLAVORS
#endif
)
{
#ifdef USE_SSL
AddFlavor(B_TRANSLATE("No encryption"));
AddFlavor(B_TRANSLATE("SSL"));
#endif
SetTo(settings);

View File

@ -12,7 +12,9 @@ SubDirHdrs [ FDirName $(SUBDIR) imap_lib ] ;
SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
local sources =
AddResources IMAP : IMAP.rdef ;
Addon IMAP :
IMAPProtocol.cpp
ConfigView.cpp
FolderConfigWindow.cpp
@ -26,20 +28,6 @@ local sources =
Commands.cpp
Protocol.cpp
Response.cpp
;
AddResources IMAP : IMAP.rdef ;
if [ FIsBuildFeatureEnabled openssl ] {
SubDirC++Flags -DUSE_SSL ;
SetupFeatureObjectsDir ssl ;
} else {
SetupFeatureObjectsDir no-ssl ;
}
Addon IMAP
:
$(sources)
:
be libmail.so localestub $(TARGET_NETWORK_LIBS) libbnetapi.so
shared [ TargetLibsupc++ ] [ TargetLibstdc++ ]