From 461cca2f52348d0588879698879fde2a5eb4b6de Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Tue, 9 Feb 2010 12:05:39 +0000
Subject: [PATCH] Link against boost and ssl to fix issues with gold linker

---
 Changelog                    |  3 +++
 configure                    | 10 ++++++++--
 qcm/libtorrent-rasterbar.qcm | 10 ++++++++--
 src/src.pro                  |  4 ++--
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Changelog b/Changelog
index eb58a4bb3..cdab52ae3 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.1.5
+    - BUGFIX: Link against boost and ssl to fix issues with gold linker
+
 * Mon Feb 8 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.4
     - BUGFIX: Fix file prioritizing in a torrent
     - BUGFIX: Make sure seeding torrents display a progress of 100%
diff --git a/configure b/configure
index 301f57c1e..73677210e 100755
--- a/configure
+++ b/configure
@@ -359,12 +359,18 @@ public:
 			return false;
 		for(int n = 0; n < incs.count(); ++n)
 			conf->addIncludePath(incs[n]);
-		if(!libs.isEmpty())
-			conf->addLib(libs);
+		//if(!libs.isEmpty())
+		//	conf->addLib(libs);
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
                         printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
 		else
 			conf->addDefine("LIBTORRENT_0_15");
+		// Get linking parameters
+		QStringList params;
+		QByteArray staticlibs;
+		params << "--static" << "--libs" << "libtorrent-rasterbar";
+		conf->doCommand("pkg-config", params, &staticlibs);
+		conf->addLib(staticlibs.trimmed());
 		return true;
 	}
 };
diff --git a/qcm/libtorrent-rasterbar.qcm b/qcm/libtorrent-rasterbar.qcm
index 01f40f86d..1372359f9 100644
--- a/qcm/libtorrent-rasterbar.qcm
+++ b/qcm/libtorrent-rasterbar.qcm
@@ -20,12 +20,18 @@ public:
 			return false;
 		for(int n = 0; n < incs.count(); ++n)
 			conf->addIncludePath(incs[n]);
-		if(!libs.isEmpty())
-			conf->addLib(libs);
+		//if(!libs.isEmpty())
+		//	conf->addLib(libs);
 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, adv_ver, &version, &incs, &libs, &other))
                         printf("\nWarning: libtorrent-rasterbar v%s was detected. Some feature will be disabled because they require v%s.\n", version.toLocal8Bit().data(), adv_ver.toUtf8().data());
 		else
 			conf->addDefine("LIBTORRENT_0_15");
+		// Get linking parameters
+		QStringList params;
+		QByteArray staticlibs;
+		params << "--static" << "--libs" << "libtorrent-rasterbar";
+		conf->doCommand("pkg-config", params, &staticlibs);
+		conf->addLib(staticlibs.trimmed());
 		return true;
 	}
 };
diff --git a/src/src.pro b/src/src.pro
index 9b271dc23..504111831 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -103,8 +103,8 @@ contains(DEFINES, DISABLE_GUI) {
 # QMAKE_CXXFLAGS_RELEASE += -fwrapv
 # QMAKE_CXXFLAGS_DEBUG += -fwrapv
 unix:QMAKE_LFLAGS_SHAPP += -rdynamic
-CONFIG += link_pkgconfig
-PKGCONFIG += "libtorrent-rasterbar"
+#CONFIG += link_pkgconfig
+#PKGCONFIG += "libtorrent-rasterbar"
 QT += network
 !contains(DEFINES, DISABLE_GUI) {
     QT += xml