From 732cc41be4aed1a402b5742ffba925c5f5d857d6 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Tue, 3 Apr 2007 21:49:52 +0000 Subject: [PATCH] - qConf is buggy and the configure file was not working properly. I had to rewrite most of the configure code to get it working. --- qcm/libboost.qcm | 68 ++++++++++++++++++++++++--------------- qcm/libcurl.qcm | 79 +++++++++++++++++++++++++--------------------- qcm/libtorrent.qcm | 74 ++++++++++++++++++++++++------------------- 3 files changed, 126 insertions(+), 95 deletions(-) diff --git a/qcm/libboost.qcm b/qcm/libboost.qcm index 62120d3fe..e4fcbecb8 100644 --- a/qcm/libboost.qcm +++ b/qcm/libboost.qcm @@ -1,6 +1,7 @@ /* -----BEGIN QCMOD----- name: libboost +arg: with-libboost-inc=[path], Path to libboost include files -----END QCMOD----- */ class qc_libboost : public ConfObj @@ -10,31 +11,46 @@ public: QString name() const { return "libboost"; } QString shortname() const { return "libboost"; } bool exec(){ - QString s; - QStringList sl; - sl += "/usr/include"; - sl += "/usr/local/include"; - sl += "/sw/include"; - if(!conf->findHeader("boost/format.hpp", sl, &s)) { - qWarning("libboost includes not found!"); - return false; - } - conf->addIncludePath(s); - if(!conf->findHeader("boost/date_time/posix_time/posix_time.hpp", sl, &s)) { - qWarning("libboost-date-time includes not found!"); - return false; - } - conf->addIncludePath(s); - if(!conf->findHeader("boost/filesystem/path.hpp", sl, &s)) { - qWarning("libboost-filesystem includes not found!"); - return false; - } - if(!conf->findHeader("boost/thread.hpp", sl, &s)) { - qWarning("libboost-thread includes not found!"); - return false; - } - conf->addIncludePath(s); - - return true; + QString s; + s = conf->getenv("QC_WITH_LIBBOOST_INC"); + if(!s.isEmpty()) { + if(!conf->checkHeader(s, "boost/format.hpp")) { + return false; + } + if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) { + return false; + } + if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) { + return false; + } + if(!conf->checkHeader(s, "boost/thread.hpp")) { + return false; + } + }else{ + QStringList sl; + sl << "/usr/include"; + sl << "/usr/local/include"; + bool found = false; + foreach(s, sl){ + if(conf->checkHeader(s, "boost/format.hpp")){ + found = true; + break; + } + } + if(!found) { + return false; + } + if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) { + return false; + } + if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) { + return false; + } + if(!conf->checkHeader(s, "boost/thread.hpp")) { + return false; + } + } + conf->addIncludePath(s); + return true; } }; diff --git a/qcm/libcurl.qcm b/qcm/libcurl.qcm index d49c59401..f5577eed1 100644 --- a/qcm/libcurl.qcm +++ b/qcm/libcurl.qcm @@ -12,43 +12,50 @@ public: QString name() const { return "libcurl"; } QString shortname() const { return "libcurl"; } bool exec(){ - QString s; - s = conf->getenv("QC_WITH_LIBCURL_INC"); - if(!s.isEmpty()) { - if(!conf->checkHeader(s, "curl/curl.h")) { - qWarning("libcurl includes not found!"); - return false; + QString s; + s = conf->getenv("QC_WITH_LIBCURL_INC"); + if(!s.isEmpty()) { + if(!conf->checkHeader(s, "curl/curl.h")) { + return false; } - conf->addIncludePath(s); - }else{ - QStringList sl; - sl += "/usr/include"; - sl += "/usr/local/include"; - if(!conf->findHeader("curl/curl.h", sl, &s)) { - qWarning("libcurl includes not found!"); - return false; - } - conf->addIncludePath(s); - } + }else{ + QStringList sl; + sl << "/usr/include"; + sl << "/usr/local/include"; + bool found = false; + foreach(s, sl){ + if(conf->checkHeader(s, "curl/curl.h")){ + found = true; + break; + } + } + if(!found) { + return false; + } + } + conf->addIncludePath(s); - s = conf->getenv("QC_WITH_LIBCURL_LIB"); - if(!s.isEmpty()) { - if(!conf->checkLibrary(s, "curl")) { - qWarning("libcurl library not found!"); - return false; - } - conf->addLib(QString("-L") + s); - }else{ - if(!conf->findLibrary("curl", &s)) { - qWarning("libcurl library not found!"); - return false; - } - if (!s.isEmpty()) - conf->addLib(QString("-L") + s); - } - - conf->addLib("-lcurl"); - - return true; + s = conf->getenv("QC_WITH_LIBCURL_LIB"); + if(!s.isEmpty()) { + if(!conf->checkLibrary(s, "curl")) { + return false; + } + conf->addLib(QString("-L") + s); + }else{ + QStringList sl; + sl << "/usr/lib/"; + sl << "/usr/local/lib/"; + bool found = false; + foreach(s, sl){ + if(conf->checkLibrary(s, "curl")){ + found = true; + break; + } + } + if(!found) return false; + conf->addLib(QString("-L") + s); + } + conf->addLib("-lcurl"); + return true; } }; diff --git a/qcm/libtorrent.qcm b/qcm/libtorrent.qcm index 31907612e..a5299703f 100644 --- a/qcm/libtorrent.qcm +++ b/qcm/libtorrent.qcm @@ -12,43 +12,51 @@ public: QString name() const { return "libtorrent >= 0.12"; } QString shortname() const { return "libtorrent"; } bool exec(){ - QString s; - s = conf->getenv("QC_WITH_LIBTORRENT_INC"); - if(!s.isEmpty()) { - if(!conf->checkHeader(s, "libtorrent/extensions/ut_pex.hpp")) { - qWarning("libtorrent v0.12 includes not found!\nYou can download it at http://www.libtorrent.net"); - return false; + QString s; + s = conf->getenv("QC_WITH_LIBTORRENT_INC"); + if(!s.isEmpty()) { + if(!conf->checkHeader(s, "libtorrent/extensions/ut_pex.hpp")) { + return false; } - conf->addIncludePath(s); - }else{ - QStringList sl; - sl << "/usr/include/"; - sl << "/usr/local/include"; - if(!conf->findHeader("libtorrent/extensions/ut_pex.hpp", sl, &s)) { - qWarning("libtorrent v0.12 includes not found!\nYou can download it at http://www.libtorrent.net"); - return false; - } - conf->addIncludePath(s); - } + }else{ + QStringList sl; + sl << "/usr/include"; + sl << "/usr/local/include"; + bool found = false; + foreach(s, sl){ + if(conf->checkHeader(s, "libtorrent/extensions/ut_pex.hpp")){ + found = true; + break; + } + } + if(!found) { + return false; + } + } + conf->addIncludePath(s); + conf->addIncludePath(s+QDir::separator()+"libtorrent"); - s = conf->getenv("QC_WITH_LIBTORRENT_LIB"); - if(!s.isEmpty()) { + s = conf->getenv("QC_WITH_LIBTORRENT_LIB"); + if(!s.isEmpty()) { if(!conf->checkLibrary(s, "torrent")) { - qWarning("libtorrent library not found!"); return false; - } + } conf->addLib(QString("-L") + s); - }else{ - if(!conf->findLibrary("torrent", &s)) { - qWarning("libtorrent library not found!"); - return false; - } - if (!s.isEmpty()) - conf->addLib(QString("-L") + s); - } - - conf->addLib("-ltorrent"); - - return true; + }else{ + QStringList sl; + sl << "/usr/lib/"; + sl << "/usr/local/lib/"; + bool found = false; + foreach(s, sl){ + if(conf->checkLibrary(s, "torrent")){ + found = true; + break; + } + } + if(!found) return false; + conf->addLib(QString("-L") + s); + } + conf->addLib("-ltorrent"); + return true; } };