setup: okay, actually try 0.6c12dev this time

[tahoe-lafs/zfec.git] / zfec / setup.py

diff --git a/zfec/setup.py b/zfec/setup.py
index 2fb9a4b85089756c13d5b880b8a2af4649cfbc10..3684b6d3886d28de364de33d3393b63b62dd96c6 100755 (executable)
--- a/zfec/setup.py
+++ b/zfec/setup.py
@@ -2,7 +2,7 @@
 
 # zfec -- fast forward error correction library with Python interface
 # 
-# Copyright (C) 2007-2008 Allmydata, Inc.
+# Copyright (C) 2007-2009 Allmydata, Inc.
 # Author: Zooko Wilcox-O'Hearn
 # 
 # This file is part of zfec.
@@ -23,7 +23,12 @@ else:
     # key set in sys.modules but the actual code (and the temporary directory
     # in the filesystem in which the code used to reside) gone, when it needed
     # pyutil again later.
-    use_setuptools(min_version='0.6c9', download_delay=0, to_dir=miscdeps)
+    # On cygwin there was a conflict with swig with setuptools 0.6c7:
+    #   File "/home/Buildslave/windows-cygwin-pycryptopp/windows-cygwin/build/misc/dependencies/setuptools-0.6c7.egg/setuptools/command/build_ext.py", line 77, in swig_sources
+    # TypeError: swig_sources() takes exactly 3 arguments (2 given)
+    # If there isn't a setuptools already installed, then this will install
+    # setuptools v0.6c12dev (which is our own toothpick of setuptools).
+    use_setuptools(download_delay=0, min_version="0.6c12dev")
 
 from setuptools import Extension, find_packages, setup