Author: andar
Revision: 5822
Log:
Modify setup.py to allow building without libtorrent/
Diff:
Modified: branches/1.2_RC/DEPENDS
===================================================================
--- branches/1.2_RC/DEPENDS 2009-10-08 02:43:54 UTC (rev 5821)
+++ branches/1.2_RC/DEPENDS 2009-10-08 02:51:49 UTC (rev 5822)
@@ -8,14 +8,8 @@
* gettext
* pyxdg
* geoip-database (optional)
+ * libtorrent >= 0.14.5
- * libtorrent >= 0.14, or build the included version
-
- * If building included libtorrent::
- * boost >= 1.34.1
- * openssl
- * zlib
-
=== UIs ===
* chardet
Modified: branches/1.2_RC/setup.py
===================================================================
--- branches/1.2_RC/setup.py 2009-10-08 02:43:54 UTC (rev 5821)
+++ branches/1.2_RC/setup.py 2009-10-08 02:51:49 UTC (rev 5822)
@@ -207,7 +207,7 @@
else:
build_libtorrent = False
-if build_libtorrent:
+if build_libtorrent and os.path.exists("libtorrent"):
# There isn't a system libtorrent library, so let's build the one included
with deluge
libtorrent = Extension(
'libtorrent',
Modified: trunk/setup.py
===================================================================
--- trunk/setup.py 2009-10-08 02:43:54 UTC (rev 5821)
+++ trunk/setup.py 2009-10-08 02:51:49 UTC (rev 5822)
@@ -207,7 +207,7 @@
else:
build_libtorrent = False
-if build_libtorrent:
+if build_libtorrent and os.path.exists("libtorrent"):
# There isn't a system libtorrent library, so let's build the one included
with deluge
libtorrent = Extension(
'libtorrent',
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
