[pypy-svn] r54677 - in pypy/dist/pypy: config rlib

[bigdog at codespeak.net]

Author: bigdog
Date: Mon May 12 15:47:54 2008
New Revision: 54677

Modified:
   pypy/dist/pypy/config/pypyoption.py
   pypy/dist/pypy/rlib/rzlib.py
Log:
add windows-specific option to zlib build rule, look for zlib rather the z.  Activate zlib on windows allworking modules set

Modified: pypy/dist/pypy/config/pypyoption.py
==============================================================================
--- pypy/dist/pypy/config/pypyoption.py	(original)
+++ pypy/dist/pypy/config/pypyoption.py	Mon May 12 15:47:54 2008
@@ -44,7 +44,6 @@
     del working_modules["select"] # MLS - Added 5/11/08 - broken
     # modules with unknown windows support
     # XXX what exactly is broken here? are the libs installed on the buildbots?
-    del working_modules["zlib"] # MLS - Added 5/11/08 - broken
  
 
 

Modified: pypy/dist/pypy/rlib/rzlib.py
==============================================================================
--- pypy/dist/pypy/rlib/rzlib.py	(original)
+++ pypy/dist/pypy/rlib/rzlib.py	Mon May 12 15:47:54 2008
@@ -4,7 +4,11 @@
 from pypy.translator.tool.cbuild import ExternalCompilationInfo
 
 includes = ['zlib.h']
-libraries = ['z']
+if sys.platform == "win32":
+    libraries = ['zlib']
+else:
+    libraries = ['z']
+
 
 constantnames = '''
     Z_OK  Z_STREAM_ERROR  Z_BUF_ERROR  Z_MEM_ERROR  Z_STREAM_END