From 046420e7bd5d7f34c960fa865bb7c90de4908953 Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Tue, 26 Nov 2013 23:49:30 +0200 Subject: [PATCH] Fix build system under Ubuntu 13.10. Closes #1061 #1130 #1124. --- configure | 2 +- qcm/libboost.qcm | 2 +- qcm/libtorrent-rasterbar.qcm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 53c8b8980..cb0230c8d 100755 --- a/configure +++ b/configure @@ -511,7 +511,7 @@ public: QStringList libDirs; if (!s.isEmpty()) libDirs << s; - libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/"; + libDirs << "/usr/lib/" << "/usr/lib/i386-linux-gnu/" << "/usr/lib64/" << "/usr/lib/x86_64-linux-gnu/" << "/usr/local/lib/" << "/usr/lib/local/i386-linux-gnu/" << "/usr/local/lib64/" << "/usr/local/lib/x86_64-linux-gnu/"; foreach(const QString& lib, required_libs) { bool found = false; diff --git a/qcm/libboost.qcm b/qcm/libboost.qcm index 4f4f642de..2afd1066c 100644 --- a/qcm/libboost.qcm +++ b/qcm/libboost.qcm @@ -75,7 +75,7 @@ public: QStringList libDirs; if (!s.isEmpty()) libDirs << s; - libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/"; + libDirs << "/usr/lib/" << "/usr/lib/i386-linux-gnu/" << "/usr/lib64/" << "/usr/lib/x86_64-linux-gnu/" << "/usr/local/lib/" << "/usr/lib/local/i386-linux-gnu/" << "/usr/local/lib64/" << "/usr/local/lib/x86_64-linux-gnu/"; foreach(const QString& lib, required_libs) { bool found = false; diff --git a/qcm/libtorrent-rasterbar.qcm b/qcm/libtorrent-rasterbar.qcm index 7c57f6d67..4b22552d1 100644 --- a/qcm/libtorrent-rasterbar.qcm +++ b/qcm/libtorrent-rasterbar.qcm @@ -8,11 +8,11 @@ class qc_libtorrent_rasterbar : public ConfObj { public: qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {} - QString name() const { return "libtorrent-rasterbar >= 0.15.0"; } + QString name() const { return "libtorrent-rasterbar >= 0.16.0"; } QString shortname() const { return "libtorrent-rasterbar"; } bool exec(){ QStringList incs; - QString req_ver = "0.15.0"; + QString req_ver = "0.16.0"; QString version, libs, other; VersionMode mode = VersionMin; if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))