From 057743a779d583d3c30588eaec887901f742415e Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Wed, 7 Apr 2010 09:06:11 +0000 Subject: [PATCH] Do not display a warning when libtorrent < 0.14.x is detected since it is the advised version --- configure | 7 ++++--- qcm/libtorrent-rasterbar.qcm | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 33fcb4ea9..0a49db7e4 100755 --- a/configure +++ b/configure @@ -364,10 +364,11 @@ public: 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 + 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; diff --git a/qcm/libtorrent-rasterbar.qcm b/qcm/libtorrent-rasterbar.qcm index 38e321861..16f606e2f 100644 --- a/qcm/libtorrent-rasterbar.qcm +++ b/qcm/libtorrent-rasterbar.qcm @@ -22,10 +22,11 @@ public: 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 + 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;