From 02722dc3c9e549a3d00a6c75d8a59d923aeec95c Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sat, 22 Jan 2011 19:01:16 +0000 Subject: [PATCH] Drop dependency on libboost-thread --- INSTALL | 4 ++-- configure | 8 +------- qcm/libboost.qcm | 8 +------- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/INSTALL b/INSTALL index 14d901a81..def693592 100644 --- a/INSTALL +++ b/INSTALL @@ -18,9 +18,9 @@ qBittorrent - A BitTorrent client in C++ / Qt4 -> http://www.libtorrent.net Be careful: another library (the one used by rTorrent) uses a similar name. - - libboost 1.34.x (libboost-filesystem, libboost-thread, libboost-date-time) + libasio + - libboost 1.34.x (libboost-filesystem, libboost-date-time) + libasio or - - libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-thread, libboost-date-time) + - libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-date-time) - python >= 2.3 (needed by search engine) * Run time only dependency diff --git a/configure b/configure index e5109b66f..cdde7c7da 100755 --- a/configure +++ b/configure @@ -451,9 +451,6 @@ public: if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) { return false; } - if(!conf->checkHeader(s, "boost/thread.hpp")) { - return false; - } }else{ QStringList sl; sl << "/usr/include"; @@ -474,9 +471,6 @@ public: if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) { return false; } - if(!conf->checkHeader(s, "boost/thread.hpp")) { - return false; - } } conf->addIncludePath(s); // Find library @@ -487,7 +481,7 @@ public: #endif if(conf->getenv("QC_DISABLE_GUI").isEmpty()) { // Not required by nox - required_libs << "filesystem" << "thread"; + required_libs << "filesystem" ; } QStringList libDirs; libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/"; diff --git a/qcm/libboost.qcm b/qcm/libboost.qcm index 418efe841..14167420d 100644 --- a/qcm/libboost.qcm +++ b/qcm/libboost.qcm @@ -48,9 +48,6 @@ public: if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) { return false; } - if(!conf->checkHeader(s, "boost/thread.hpp")) { - return false; - } }else{ QStringList sl; sl << "/usr/include"; @@ -71,9 +68,6 @@ public: if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) { return false; } - if(!conf->checkHeader(s, "boost/thread.hpp")) { - return false; - } } conf->addIncludePath(s); // Find library @@ -84,7 +78,7 @@ public: #endif if(conf->getenv("QC_DISABLE_GUI").isEmpty()) { // Not required by nox - required_libs << "filesystem" << "thread"; + required_libs << "filesystem" ; } QStringList libDirs; libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";