merge

README.rst

@@ -30,7 +30,7 @@ Post feedback and issues on the `bug tracker`_, `mailing list`_, blog_ and `twit
 
 
 .. _gevent: http://www.gevent.org
-.. _greenlet: http://codespeak.net/py/0.9.2/greenlet.html
+.. _greenlet: http://pypi.python.org/pypi/greenlet
 .. _libev: http://libev.schmorp.de/
 .. _c-ares: http://c-ares.haxx.se/
 .. _inspired by eventlet: http://blog.gevent.org/2010/02/27/why-gevent/

setup.py

@@ -21,8 +21,9 @@ ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError, IOErro
 __version__ = re.search("__version__\s*=\s*'(.*)'", open('gevent/__init__.py').read(), re.M).group(1)
 assert __version__
 
-libev_embed = os.path.exists('libev')
-ares_embed = os.path.exists('c-ares')
+embed = os.environ.get("gevent_embed", "yes").lower().strip() not in ("0", "no", "off")
+libev_embed = embed and os.path.exists('libev')
+ares_embed = embed and os.path.exists('c-ares')
 define_macros = []
 libraries = []
 libev_configure_command = ["/bin/sh", abspath('libev/configure'), '> configure-output.txt']