From fe377243383cd385811f9c8462992bd6b20d3675 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sat, 10 Nov 2007 09:27:25 +0000 Subject: [PATCH] - Removed Fedora pkg-config workaround because Fedora 8 fixed the problem --- TODO | 1 + configure | 10 ---------- qcm/libtorrent.qcm | 10 ---------- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/TODO b/TODO index cc1086013..6e35e2983 100644 --- a/TODO +++ b/TODO @@ -60,3 +60,4 @@ rc7->rc8 changelog: - BUGFIX: Fixed torrent files filtering - BUGFIX: Stop search when clearing results +- BUGFIX: Fixed compilation on Fedora 8 diff --git a/configure b/configure index 533754184..469d08e49 100755 --- a/configure +++ b/configure @@ -425,16 +425,6 @@ public: if(!found) return false; conf->addLib(QString("-L") + s); } - // BUGFIX for Fedora (doesn't support pkg-config?) - QFile issue_file("/etc/issue"); - if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){ - QString content = issue_file.readAll(); - issue_file.close(); - if(content.indexOf("Fedora") != -1){ - qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled"); - conf->addLib("-lssl -lcrypto -lboost_date_time -lboost_filesystem -lboost_thread -lz -ltorrent"); - } - } return true; } }; diff --git a/qcm/libtorrent.qcm b/qcm/libtorrent.qcm index 808a9d822..f0a093497 100644 --- a/qcm/libtorrent.qcm +++ b/qcm/libtorrent.qcm @@ -65,16 +65,6 @@ public: if(!found) return false; conf->addLib(QString("-L") + s); } - // BUGFIX for Fedora (doesn't support pkg-config?) - QFile issue_file("/etc/issue"); - if(issue_file.open(QIODevice::ReadOnly | QIODevice::Text)){ - QString content = issue_file.readAll(); - issue_file.close(); - if(content.indexOf("Fedora") != -1){ - qWarning("Fedora detected. WORKAROUND for Fedora pkg-config problem enabled"); - conf->addLib("-lssl -lcrypto -lboost_date_time -lboost_filesystem -lboost_thread -lz -ltorrent"); - } - } return true; } };