mirror of
https://github.com/d47081/qBittorrent.git
synced 2025-01-30 16:34:16 +00:00
- Updated configure file to check for libtorrent >= v0.12 instead of v0.11 (Thanks Jack H.)
This commit is contained in:
parent
78aef3c3bc
commit
243045917a
25
configure
vendored
25
configure
vendored
@ -10,12 +10,11 @@ Usage: $0 [OPTION]...
|
|||||||
This script creates necessary configuration files to build/install.
|
This script creates necessary configuration files to build/install.
|
||||||
|
|
||||||
Main options:
|
Main options:
|
||||||
--prefix=[path] Base path for build/install. Default: /usr/local
|
--prefix=[path] Base path for build/install. Default: /usr/local
|
||||||
--bindir=[path] Directory for binaries. Default: PREFIX/bin
|
--bindir=[path] Directory for binaries. Default: PREFIX/bin
|
||||||
--datadir=[path] Directory for data. Default: PREFIX/share
|
--qtdir=[path] Directory where Qt is installed.
|
||||||
--qtdir=[path] Directory where Qt is installed.
|
--verbose Show extra configure output.
|
||||||
--verbose Show extra configure output.
|
--help This help text.
|
||||||
--help This help text.
|
|
||||||
|
|
||||||
EOT
|
EOT
|
||||||
}
|
}
|
||||||
@ -122,11 +121,6 @@ while [ $# -gt 0 ]; do
|
|||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
|
|
||||||
--datadir=*)
|
|
||||||
DATADIR=$optarg
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
|
|
||||||
--qtdir=*)
|
--qtdir=*)
|
||||||
EX_QTDIR=$optarg
|
EX_QTDIR=$optarg
|
||||||
shift
|
shift
|
||||||
@ -143,7 +137,6 @@ done
|
|||||||
|
|
||||||
PREFIX=${PREFIX:-/usr/local}
|
PREFIX=${PREFIX:-/usr/local}
|
||||||
BINDIR=${BINDIR:-$PREFIX/bin}
|
BINDIR=${BINDIR:-$PREFIX/bin}
|
||||||
DATADIR=${DATADIR:-$PREFIX/share}
|
|
||||||
|
|
||||||
echo "Configuring qbittorrent ..."
|
echo "Configuring qbittorrent ..."
|
||||||
|
|
||||||
@ -151,7 +144,6 @@ if [ "$QC_DEBUG" = "Y" ]; then
|
|||||||
echo
|
echo
|
||||||
echo PREFIX=$PREFIX
|
echo PREFIX=$PREFIX
|
||||||
echo BINDIR=$BINDIR
|
echo BINDIR=$BINDIR
|
||||||
echo DATADIR=$DATADIR
|
|
||||||
echo EX_QTDIR=$EX_QTDIR
|
echo EX_QTDIR=$EX_QTDIR
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
@ -256,7 +248,7 @@ class qc_libtorrent : public ConfObj
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
qc_libtorrent(Conf *c) : ConfObj(c) {}
|
qc_libtorrent(Conf *c) : ConfObj(c) {}
|
||||||
QString name() const { return "libtorrent >= 0.11"; }
|
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;
|
||||||
@ -264,8 +256,8 @@ public:
|
|||||||
sl += "/usr/include";
|
sl += "/usr/include";
|
||||||
sl += "/usr/local/include";
|
sl += "/usr/local/include";
|
||||||
sl += "/sw/include";
|
sl += "/sw/include";
|
||||||
if(!conf->findHeader("libtorrent/kademlia/node.hpp", sl, &s)) {
|
if(!conf->findHeader("libtorrent/extensions/ut_pex.hpp", sl, &s)) {
|
||||||
qWarning("libtorrent v0.11 includes not found!\nYou can download it at http://www.libtorrent.net");
|
qWarning("libtorrent v0.12 includes not found!\nYou can download it at http://www.libtorrent.net");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
conf->addIncludePath(s);
|
conf->addIncludePath(s);
|
||||||
@ -1268,7 +1260,6 @@ EOT
|
|||||||
|
|
||||||
export PREFIX
|
export PREFIX
|
||||||
export BINDIR
|
export BINDIR
|
||||||
export DATADIR
|
|
||||||
export EX_QTDIR
|
export EX_QTDIR
|
||||||
export QC_DEBUG
|
export QC_DEBUG
|
||||||
rm -rf .qconftemp
|
rm -rf .qconftemp
|
||||||
|
Loading…
x
Reference in New Issue
Block a user