d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

- Fixed configure files

adaptive-webui-19844
Christophe Dumez 18 years ago
parent
732cc41be4
commit
2ab2e5a40f
1 changed files with 134 additions and 95 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 229
      configure

229
configure vendored
Unescape 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
--disable-libupnp Disable use of libupnp --disable-libupnp Disable use of libupnp
@ -152,6 +153,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
@ -205,6 +211,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 QC_DISABLE_libupnp=$QC_DISABLE_libupnp echo QC_DISABLE_libupnp=$QC_DISABLE_libupnp
@ -319,50 +326,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
@ -372,32 +388,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"
@ -415,44 +446,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) {
s = conf->getenv("QC_WITH_LIBCURL_LIB"); return false;
if(!s.isEmpty()) { }
if(!conf->checkLibrary(s, "curl")) { }
qWarning("libcurl library not found!"); conf->addIncludePath(s);
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;
} }
}; };
#line 1 "python.qcm" #line 1 "python.qcm"
@ -1487,6 +1525,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_DISABLE_libupnp export QC_DISABLE_libupnp

Write Preview
Loading…
Cancel
Save