Browse Source

Drop dependency on libboost-thread

adaptive-webui-19844
Christophe Dumez 14 years ago
parent
commit
02722dc3c9
  1. 4
      INSTALL
  2. 8
      configure
  3. 8
      qcm/libboost.qcm

4
INSTALL

@ -18,9 +18,9 @@ qBittorrent - A BitTorrent client in C++ / Qt4
-> http://www.libtorrent.net -> http://www.libtorrent.net
Be careful: another library (the one used by rTorrent) uses a similar name. 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 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) - python >= 2.3 (needed by search engine)
* Run time only dependency * Run time only dependency

8
configure vendored

@ -451,9 +451,6 @@ public:
if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) { if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
return false; return false;
} }
if(!conf->checkHeader(s, "boost/thread.hpp")) {
return false;
}
}else{ }else{
QStringList sl; QStringList sl;
sl << "/usr/include"; sl << "/usr/include";
@ -474,9 +471,6 @@ public:
if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) { if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
return false; return false;
} }
if(!conf->checkHeader(s, "boost/thread.hpp")) {
return false;
}
} }
conf->addIncludePath(s); conf->addIncludePath(s);
// Find library // Find library
@ -487,7 +481,7 @@ public:
#endif #endif
if(conf->getenv("QC_DISABLE_GUI").isEmpty()) { if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
// Not required by nox // Not required by nox
required_libs << "filesystem" << "thread"; required_libs << "filesystem" ;
} }
QStringList libDirs; QStringList libDirs;
libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/"; libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";

8
qcm/libboost.qcm

@ -48,9 +48,6 @@ public:
if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) { if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
return false; return false;
} }
if(!conf->checkHeader(s, "boost/thread.hpp")) {
return false;
}
}else{ }else{
QStringList sl; QStringList sl;
sl << "/usr/include"; sl << "/usr/include";
@ -71,9 +68,6 @@ public:
if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) { if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
return false; return false;
} }
if(!conf->checkHeader(s, "boost/thread.hpp")) {
return false;
}
} }
conf->addIncludePath(s); conf->addIncludePath(s);
// Find library // Find library
@ -84,7 +78,7 @@ public:
#endif #endif
if(conf->getenv("QC_DISABLE_GUI").isEmpty()) { if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
// Not required by nox // Not required by nox
required_libs << "filesystem" << "thread"; required_libs << "filesystem" ;
} }
QStringList libDirs; QStringList libDirs;
libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/"; libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";

Loading…
Cancel
Save