From bec8576238d8a6fa5844d839c5eee596a210c550 Mon Sep 17 00:00:00 2001
From: "Bruno G. Albuquerque" <bga@bug-br.org.br>
Date: Wed, 25 Feb 2009 10:37:42 +0000
Subject: [PATCH] Works around problem with runtime loader described here:

http://www.freelists.org/post/haiku-development/Runtime-loader-problem

The problem seems to be related to loading/unloading add-ons linked against the
recent OpenSSL. Linking the E-mail preferences against the SSL libraries (when
USE_SSL is enable) fixes this as the SSL libraries are not unloaded then.

I am still investigating this but will have no more time this week so I am commiting this workaround until I look at it again.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29320 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/preferences/mail/Jamfile | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/preferences/mail/Jamfile b/src/preferences/mail/Jamfile
index bc98aaca2f..ab7957f867 100644
--- a/src/preferences/mail/Jamfile
+++ b/src/preferences/mail/Jamfile
@@ -7,18 +7,36 @@ if $(TARGET_PLATFORM) != haiku {
 }
 
 UsePrivateHeaders mail ;
+
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
 
+local sslDir ;
+
+if $(USE_SSL) {
+	SubDirC++Flags -DUSE_SSL ;
+	if ! $(SSL_DIR) {
+		sslDir = [ FDirName $(HAIKU_OUTPUT_DIR) cross-ssl common ] ;
+	} else {
+		sslDir = $(SSL_DIR) ;
+	}
+	SubDirSysHdrs [ FDirName $(sslDir) include ] ;
+}
+
+
 Preference E-mail :
 	Account.cpp
 	CenterContainer.cpp
 	ConfigViews.cpp
 	ConfigWindow.cpp
-	main.cpp 
-	: be libmail.so
+	main.cpp
+	: be libmail.so 
 	: e-mail.rdef
 	;
 
+if $(USE_SSL) {
+	LinkAgainst E-mail : $(sslDir)/lib/libssl.so $(sslDir)/lib/libcrypto.so ;
+}
+
 Package haiku-maildaemon-cvs :
 	E-mail : 
 	boot beos preferences ;