diff --git a/configure b/configure index c1e4f4220..0948228b7 100755 --- a/configure +++ b/configure @@ -355,27 +355,12 @@ public: bool exec(){ QStringList incs; QString req_ver = "0.14.4"; - QString adv_ver = "0.15.0"; QString version, libs, other; VersionMode mode = VersionMin; if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other)) return false; for(int n = 0; n < incs.count(); ++n) conf->addIncludePath(incs[n]); - //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()); - //libcrypto if(conf->getenv("QC_DISABLE_GUI").isEmpty()) { conf->addLib("-lcrypto"); } diff --git a/qcm/libtorrent-rasterbar.qcm b/qcm/libtorrent-rasterbar.qcm index 04c759efc..61688ad4e 100644 --- a/qcm/libtorrent-rasterbar.qcm +++ b/qcm/libtorrent-rasterbar.qcm @@ -13,27 +13,12 @@ public: bool exec(){ QStringList incs; QString req_ver = "0.14.4"; - QString adv_ver = "0.15.0"; QString version, libs, other; VersionMode mode = VersionMin; if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other)) return false; for(int n = 0; n < incs.count(); ++n) conf->addIncludePath(incs[n]); - //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()); - //libcrypto if(conf->getenv("QC_DISABLE_GUI").isEmpty()) { conf->addLib("-lcrypto"); }