github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-24 07:05:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Fixed configure files

Browse source
This commit is contained in:
Christophe Dumez 2007-04-03 21:51:26 +00:00
commit 12629a9e38
6 changed files with 262 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Changelog
View file

@ -1,4 +1,4 @@
* Unknown - Christophe Dumez <chris@qbittorrent.org> - v0.9.0 * Sun Apr 01 2007 - Christophe Dumez <chris@qbittorrent.org> - v0.9.0
- FEATURE: Based on libtorrent v0.12 - FEATURE: Based on libtorrent v0.12
- FEATURE: Based on Qt4.2 - FEATURE: Based on Qt4.2
- FEATURE: Brand new trayicon from Qt4.2 - FEATURE: Brand new trayicon from Qt4.2

229
configure vendored
View file

@ -20,6 +20,7 @@ Main options:
Dependency options: Dependency options:
--with-libtorrent-inc=[path] Path to libtorrent include files --with-libtorrent-inc=[path] Path to libtorrent include files
--with-libtorrent-lib=[path] Path to libtorrent library files --with-libtorrent-lib=[path] Path to libtorrent library files
--with-libboost-inc=[path] Path to libboost include files
--with-libcurl-inc=[path] Path to libcurl include files --with-libcurl-inc=[path] Path to libcurl include files
--with-libcurl-lib=[path] Path to libcurl library files --with-libcurl-lib=[path] Path to libcurl library files
@ -148,6 +149,11 @@ while [ $# -gt 0 ]; do
shift shift
;; ;;
--with-libboost-inc=*)
QC_WITH_LIBBOOST_INC=$optarg
shift
;;
--with-libcurl-inc=*) --with-libcurl-inc=*)
QC_WITH_LIBCURL_INC=$optarg QC_WITH_LIBCURL_INC=$optarg
shift shift
@ -181,6 +187,7 @@ echo DATADIR=$DATADIR
echo EX_QTDIR=$EX_QTDIR echo EX_QTDIR=$EX_QTDIR
echo QC_WITH_LIBTORRENT_INC=$QC_WITH_LIBTORRENT_INC echo QC_WITH_LIBTORRENT_INC=$QC_WITH_LIBTORRENT_INC
echo QC_WITH_LIBTORRENT_LIB=$QC_WITH_LIBTORRENT_LIB echo QC_WITH_LIBTORRENT_LIB=$QC_WITH_LIBTORRENT_LIB
echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC
echo QC_WITH_LIBCURL_INC=$QC_WITH_LIBCURL_INC echo QC_WITH_LIBCURL_INC=$QC_WITH_LIBCURL_INC
echo QC_WITH_LIBCURL_LIB=$QC_WITH_LIBCURL_LIB echo QC_WITH_LIBCURL_LIB=$QC_WITH_LIBCURL_LIB
echo echo
@ -291,50 +298,59 @@ public:
QString name() const { return "libtorrent >= 0.12"; } QString name() const { return "libtorrent >= 0.12"; }
QString shortname() const { return "libtorrent"; } QString shortname() const { return "libtorrent"; }
bool exec(){ bool exec(){
QString s; QString s;
s = conf->getenv("QC_WITH_LIBTORRENT_INC"); s = conf->getenv("QC_WITH_LIBTORRENT_INC");
if(!s.isEmpty()) { if(!s.isEmpty()) {
if(!conf->checkHeader(s, "libtorrent/extensions/ut_pex.hpp")) { 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;
return false;
} }
conf->addIncludePath(s); }else{
}else{ QStringList sl;
QStringList sl; sl << "/usr/include";
sl << "/usr/include/"; sl << "/usr/local/include";
sl << "/usr/local/include"; bool found = false;
if(!conf->findHeader("libtorrent/extensions/ut_pex.hpp", sl, &s)) { foreach(s, sl){
qWarning("libtorrent v0.12 includes not found!\nYou can download it at http://www.libtorrent.net"); if(conf->checkHeader(s, "libtorrent/extensions/ut_pex.hpp")){
return false; found = true;
} break;
conf->addIncludePath(s); }
} }
if(!found) {
return false;
}
}
conf->addIncludePath(s);
conf->addIncludePath(s+QDir::separator()+"libtorrent");
s = conf->getenv("QC_WITH_LIBTORRENT_LIB"); s = conf->getenv("QC_WITH_LIBTORRENT_LIB");
if(!s.isEmpty()) { if(!s.isEmpty()) {
if(!conf->checkLibrary(s, "torrent")) { if(!conf->checkLibrary(s, "torrent")) {
qWarning("libtorrent library not found!");
return false; return false;
} }
conf->addLib(QString("-L") + s); conf->addLib(QString("-L") + s);
}else{ }else{
if(!conf->findLibrary("torrent", &s)) { QStringList sl;
qWarning("libtorrent library not found!"); sl << "/usr/lib/";
return false; sl << "/usr/local/lib/";
} bool found = false;
if (!s.isEmpty()) foreach(s, sl){
conf->addLib(QString("-L") + s); if(conf->checkLibrary(s, "torrent")){
} found = true;
break;
conf->addLib("-ltorrent"); }
}
return true; if(!found) return false;
conf->addLib(QString("-L") + s);
}
conf->addLib("-ltorrent");
return true;
} }
}; };
#line 1 "libboost.qcm" #line 1 "libboost.qcm"
/* /*
-----BEGIN QCMOD----- -----BEGIN QCMOD-----
name: libboost name: libboost
arg: with-libboost-inc=[path], Path to libboost include files
-----END QCMOD----- -----END QCMOD-----
*/ */
class qc_libboost : public ConfObj class qc_libboost : public ConfObj
@ -344,32 +360,47 @@ public:
QString name() const { return "libboost"; } QString name() const { return "libboost"; }
QString shortname() const { return "libboost"; } QString shortname() const { return "libboost"; }
bool exec(){ bool exec(){
QString s; QString s;
QStringList sl; s = conf->getenv("QC_WITH_LIBBOOST_INC");
sl += "/usr/include"; if(!s.isEmpty()) {
sl += "/usr/local/include"; if(!conf->checkHeader(s, "boost/format.hpp")) {
sl += "/sw/include"; return false;
if(!conf->findHeader("boost/format.hpp", sl, &s)) { }
qWarning("libboost includes not found!"); if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
return false; return false;
} }
conf->addIncludePath(s); if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
if(!conf->findHeader("boost/date_time/posix_time/posix_time.hpp", sl, &s)) { return false;
qWarning("libboost-date-time includes not found!"); }
return false; if(!conf->checkHeader(s, "boost/thread.hpp")) {
} return false;
conf->addIncludePath(s); }
if(!conf->findHeader("boost/filesystem/path.hpp", sl, &s)) { }else{
qWarning("libboost-filesystem includes not found!"); QStringList sl;
return false; sl << "/usr/include";
} sl << "/usr/local/include";
if(!conf->findHeader("boost/thread.hpp", sl, &s)) { bool found = false;
qWarning("libboost-thread includes not found!"); foreach(s, sl){
return false; if(conf->checkHeader(s, "boost/format.hpp")){
} found = true;
conf->addIncludePath(s); break;
}
return true; }
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;
} }
}; };
#line 1 "libcurl.qcm" #line 1 "libcurl.qcm"
@ -387,44 +418,51 @@ public:
QString name() const { return "libcurl"; } QString name() const { return "libcurl"; }
QString shortname() const { return "libcurl"; } QString shortname() const { return "libcurl"; }
bool exec(){ bool exec(){
QString s; QString s;
s = conf->getenv("QC_WITH_LIBCURL_INC"); s = conf->getenv("QC_WITH_LIBCURL_INC");
if(!s.isEmpty()) { if(!s.isEmpty()) {
if(!conf->checkHeader(s, "curl/curl.h")) { if(!conf->checkHeader(s, "curl/curl.h")) {
qWarning("libcurl includes not found!"); return false;
return false;
} }
conf->addIncludePath(s); }else{
}else{ QStringList sl;
QStringList sl; sl << "/usr/include";
sl += "/usr/include"; sl << "/usr/local/include";
sl += "/usr/local/include"; bool found = false;
if(!conf->findHeader("curl/curl.h", sl, &s)) { foreach(s, sl){
qWarning("libcurl includes not found!"); if(conf->checkHeader(s, "curl/curl.h")){
return false; found = true;
} break;
conf->addIncludePath(s); }
} }
if(!found) {
return false;
}
}
conf->addIncludePath(s);
s = conf->getenv("QC_WITH_LIBCURL_LIB"); s = conf->getenv("QC_WITH_LIBCURL_LIB");
if(!s.isEmpty()) { if(!s.isEmpty()) {
if(!conf->checkLibrary(s, "curl")) { if(!conf->checkLibrary(s, "curl")) {
qWarning("libcurl library not found!"); return false;
return false; }
} conf->addLib(QString("-L") + s);
conf->addLib(QString("-L") + s); }else{
}else{ QStringList sl;
if(!conf->findLibrary("curl", &s)) { sl << "/usr/lib/";
qWarning("libcurl library not found!"); sl << "/usr/local/lib/";
return false; bool found = false;
} foreach(s, sl){
if (!s.isEmpty()) if(conf->checkLibrary(s, "curl")){
conf->addLib(QString("-L") + s); found = true;
} break;
}
conf->addLib("-lcurl"); }
if(!found) return false;
return true; conf->addLib(QString("-L") + s);
}
conf->addLib("-lcurl");
return true;
} }
}; };
#line 1 "python.qcm" #line 1 "python.qcm"
@ -1393,6 +1431,7 @@ export DATADIR
export EX_QTDIR export EX_QTDIR
export QC_WITH_LIBTORRENT_INC export QC_WITH_LIBTORRENT_INC
export QC_WITH_LIBTORRENT_LIB export QC_WITH_LIBTORRENT_LIB
export QC_WITH_LIBBOOST_INC
export QC_WITH_LIBCURL_INC export QC_WITH_LIBCURL_INC
export QC_WITH_LIBCURL_LIB export QC_WITH_LIBCURL_LIB
export QC_DEBUG export QC_DEBUG

68
qcm/libboost.qcm
View file

@ -1,6 +1,7 @@
/* /*
-----BEGIN QCMOD----- -----BEGIN QCMOD-----
name: libboost name: libboost
arg: with-libboost-inc=[path], Path to libboost include files
-----END QCMOD----- -----END QCMOD-----
*/ */
class qc_libboost : public ConfObj class qc_libboost : public ConfObj
@ -10,31 +11,46 @@ public:
QString name() const { return "libboost"; } QString name() const { return "libboost"; }
QString shortname() const { return "libboost"; } QString shortname() const { return "libboost"; }
bool exec(){ bool exec(){
QString s; QString s;
QStringList sl; s = conf->getenv("QC_WITH_LIBBOOST_INC");
sl += "/usr/include"; if(!s.isEmpty()) {
sl += "/usr/local/include"; if(!conf->checkHeader(s, "boost/format.hpp")) {
sl += "/sw/include"; return false;
if(!conf->findHeader("boost/format.hpp", sl, &s)) { }
qWarning("libboost includes not found!"); if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
return false; return false;
} }
conf->addIncludePath(s); if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
if(!conf->findHeader("boost/date_time/posix_time/posix_time.hpp", sl, &s)) { return false;
qWarning("libboost-date-time includes not found!"); }
return false; if(!conf->checkHeader(s, "boost/thread.hpp")) {
} return false;
conf->addIncludePath(s); }
if(!conf->findHeader("boost/filesystem/path.hpp", sl, &s)) { }else{
qWarning("libboost-filesystem includes not found!"); QStringList sl;
return false; sl << "/usr/include";
} sl << "/usr/local/include";
if(!conf->findHeader("boost/thread.hpp", sl, &s)) { bool found = false;
qWarning("libboost-thread includes not found!"); foreach(s, sl){
return false; if(conf->checkHeader(s, "boost/format.hpp")){
} found = true;
conf->addIncludePath(s); break;
}
return true; }
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;
} }
}; };

79
qcm/libcurl.qcm
View file

@ -12,43 +12,50 @@ public:
QString name() const { return "libcurl"; } QString name() const { return "libcurl"; }
QString shortname() const { return "libcurl"; } QString shortname() const { return "libcurl"; }
bool exec(){ bool exec(){
QString s; QString s;
s = conf->getenv("QC_WITH_LIBCURL_INC"); s = conf->getenv("QC_WITH_LIBCURL_INC");
if(!s.isEmpty()) { if(!s.isEmpty()) {
if(!conf->checkHeader(s, "curl/curl.h")) { if(!conf->checkHeader(s, "curl/curl.h")) {
qWarning("libcurl includes not found!"); return false;
return false;
} }
conf->addIncludePath(s); }else{
}else{ QStringList sl;
QStringList sl; sl << "/usr/include";
sl += "/usr/include"; sl << "/usr/local/include";
sl += "/usr/local/include"; bool found = false;
if(!conf->findHeader("curl/curl.h", sl, &s)) { foreach(s, sl){
qWarning("libcurl includes not found!"); if(conf->checkHeader(s, "curl/curl.h")){
return false; found = true;
} break;
conf->addIncludePath(s); }
} }
if(!found) {
return false;
}
}
conf->addIncludePath(s);
s = conf->getenv("QC_WITH_LIBCURL_LIB"); s = conf->getenv("QC_WITH_LIBCURL_LIB");
if(!s.isEmpty()) { if(!s.isEmpty()) {
if(!conf->checkLibrary(s, "curl")) { if(!conf->checkLibrary(s, "curl")) {
qWarning("libcurl library not found!"); return false;
return false; }
} conf->addLib(QString("-L") + s);
conf->addLib(QString("-L") + s); }else{
}else{ QStringList sl;
if(!conf->findLibrary("curl", &s)) { sl << "/usr/lib/";
qWarning("libcurl library not found!"); sl << "/usr/local/lib/";
return false; bool found = false;
} foreach(s, sl){
if (!s.isEmpty()) if(conf->checkLibrary(s, "curl")){
conf->addLib(QString("-L") + s); found = true;
} break;
}
conf->addLib("-lcurl"); }
if(!found) return false;
return true; conf->addLib(QString("-L") + s);
}
conf->addLib("-lcurl");
return true;
} }
}; };

74
qcm/libtorrent.qcm
View file

@ -12,43 +12,51 @@ public:
QString name() const { return "libtorrent >= 0.12"; } QString name() const { return "libtorrent >= 0.12"; }
QString shortname() const { return "libtorrent"; } QString shortname() const { return "libtorrent"; }
bool exec(){ bool exec(){
QString s; QString s;
s = conf->getenv("QC_WITH_LIBTORRENT_INC"); s = conf->getenv("QC_WITH_LIBTORRENT_INC");
if(!s.isEmpty()) { if(!s.isEmpty()) {
if(!conf->checkHeader(s, "libtorrent/extensions/ut_pex.hpp")) { 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;
return false;
} }
conf->addIncludePath(s); }else{
}else{ QStringList sl;
QStringList sl; sl << "/usr/include";
sl << "/usr/include/"; sl << "/usr/local/include";
sl << "/usr/local/include"; bool found = false;
if(!conf->findHeader("libtorrent/extensions/ut_pex.hpp", sl, &s)) { foreach(s, sl){
qWarning("libtorrent v0.12 includes not found!\nYou can download it at http://www.libtorrent.net"); if(conf->checkHeader(s, "libtorrent/extensions/ut_pex.hpp")){
return false; found = true;
} break;
conf->addIncludePath(s); }
} }
if(!found) {
return false;
}
}
conf->addIncludePath(s);
conf->addIncludePath(s+QDir::separator()+"libtorrent");
s = conf->getenv("QC_WITH_LIBTORRENT_LIB"); s = conf->getenv("QC_WITH_LIBTORRENT_LIB");
if(!s.isEmpty()) { if(!s.isEmpty()) {
if(!conf->checkLibrary(s, "torrent")) { if(!conf->checkLibrary(s, "torrent")) {
qWarning("libtorrent library not found!");
return false; return false;
} }
conf->addLib(QString("-L") + s); conf->addLib(QString("-L") + s);
}else{ }else{
if(!conf->findLibrary("torrent", &s)) { QStringList sl;
qWarning("libtorrent library not found!"); sl << "/usr/lib/";
return false; sl << "/usr/local/lib/";
} bool found = false;
if (!s.isEmpty()) foreach(s, sl){
conf->addLib(QString("-L") + s); if(conf->checkLibrary(s, "torrent")){
} found = true;
break;
conf->addLib("-ltorrent"); }
}
return true; if(!found) return false;
conf->addLib(QString("-L") + s);
}
conf->addLib("-ltorrent");
return true;
} }
}; };

2
src/src.pro
View file

@ -11,7 +11,7 @@ TARGET = qbittorrent
CONFIG += qt thread x11 CONFIG += qt thread x11
# Update this VERSION for each release # Update this VERSION for each release
DEFINES += VERSION=\\\"v0.9.0rc2\\\" DEFINES += VERSION=\\\"v0.9.0\\\"
DEFINES += VERSION_MAJOR=0 DEFINES += VERSION_MAJOR=0
DEFINES += VERSION_MINOR=9 DEFINES += VERSION_MINOR=9
DEFINES += VERSION_BUGFIX=0 DEFINES += VERSION_BUGFIX=0