Build python module for zlib unconditionally. This makes

python2[12]{,-pth} build on platforms where zlib.h is not in
/usr/include.

8 files changed, 151 insertions, 51 deletions

diff --git a/lang/python21-pth/distinfo b/lang/python21-pth/distinfo
index d3cf1b2571f..2af6ddb4b83 100644
--- a/lang/python21-pth/distinfo
+++ b/lang/python21-pth/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2003/06/06 18:14:12 drochner Exp $
+$NetBSD: distinfo,v 1.8 2004/05/16 20:01:59 minskim Exp $
 
 SHA1 (Python-2.1.3.tgz) = 7042a5c5fd60d334c0ac227885d68a4c305713b4
 Size (Python-2.1.3.tgz) = 6194432 bytes
 SHA1 (patch-aa) = d87aebf7b89a559e83c13a039fbdb98b39835211
 SHA1 (patch-ab) = e39bbe1e46bfc535dc887eeb9059e0c500c393db
-SHA1 (patch-ac) = 042664030635fdcc1516c66b12568f1d5cb987d1
+SHA1 (patch-ac) = 4da78f997fb45365eee6d266c73bc129fe865d12
 SHA1 (patch-ad) = 769bcd7803723c8d538a74173792ffcc491fa414
 SHA1 (patch-ae) = 079cd208ba57755a7e0f3ac03b6ba59d622be5db
 SHA1 (patch-af) = 4e446bd88334dbee441f6a8dc41e7eaeb771e773
diff --git a/lang/python21-pth/patches/patch-ac b/lang/python21-pth/patches/patch-ac
index 4ec68c75433..6f252fb856e 100644
--- a/lang/python21-pth/patches/patch-ac
+++ b/lang/python21-pth/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2002/09/04 14:25:18 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2004/05/16 20:01:59 minskim Exp $
 
---- setup.py.orig	Thu Dec 27 22:51:02 2001
-+++ setup.py	Wed Aug 28 16:15:08 2002
-@@ -145,12 +145,6 @@
+--- setup.py.orig	2001-12-27 15:51:02.000000000 -0600
++++ setup.py
+@@ -145,12 +145,6 @@ class PyBuildExt(build_ext):
          return platform
  
      def detect_modules(self):
@@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.2 2002/09/04 14:25:18 drochner Exp $
          # lib_dirs and inc_dirs are used to search for files;
          # if a file is found in one of those directories, it can
          # be assumed that no additional -I,-L directives are needed.
-@@ -265,13 +259,13 @@
+@@ -265,13 +259,13 @@ class PyBuildExt(build_ext):
          # These represent audio samples or images as strings:
  
          # Disabled on 64-bit platforms
@@ -33,7 +33,7 @@ $NetBSD: patch-ac,v 1.2 2002/09/04 14:25:18 drochner Exp $
  
          # readline
          if self.compiler.find_library_file(lib_dirs, 'readline'):
-@@ -296,14 +290,10 @@
+@@ -296,14 +290,10 @@ class PyBuildExt(build_ext):
          # socket(2)
          # Detect SSL support for the socket module
          ssl_incs = find_file('openssl/ssl.h', inc_dirs,
@@ -50,7 +50,7 @@ $NetBSD: patch-ac,v 1.2 2002/09/04 14:25:18 drochner Exp $
  
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -408,8 +398,8 @@
+@@ -408,8 +398,8 @@ class PyBuildExt(build_ext):
  
          if (self.compiler.find_library_file(lib_dirs, 'ncurses')):
              curses_libs = ['ncurses']
@@ -61,7 +61,7 @@ $NetBSD: patch-ac,v 1.2 2002/09/04 14:25:18 drochner Exp $
          elif (self.compiler.find_library_file(lib_dirs, 'curses')) and platform[:6] != 'darwin':
          	# OSX has an old Berkeley curses, not good enough for the _curses module.
              if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
-@@ -417,8 +407,8 @@
+@@ -417,8 +407,8 @@ class PyBuildExt(build_ext):
              else:
                  curses_libs = ['curses', 'termcap']
  
@@ -72,7 +72,32 @@ $NetBSD: patch-ac,v 1.2 2002/09/04 14:25:18 drochner Exp $
  
          # If the curses module is enabled, check for the panel module
          if (os.path.exists('Modules/_curses_panel.c') and
-@@ -609,7 +599,7 @@
+@@ -451,23 +441,7 @@ class PyBuildExt(build_ext):
+         # Andrew Kuchling's zlib module.
+         # This require zlib 1.1.3 (or later).
+         # See http://www.cdrom.com/pub/infozip/zlib/
+-        zlib_inc = find_file('zlib.h', [], inc_dirs)
+-        if zlib_inc is not None:
+-            zlib_h = zlib_inc[0] + '/zlib.h'
+-            version = '"0.0.0"'
+-            version_req = '"1.1.3"'
+-            fp = open(zlib_h)
+-            while 1:
+-                line = fp.readline()
+-                if not line:
+-                    break
+-                if line.find('#define ZLIB_VERSION', 0) == 0:
+-                    version = line.split()[2]
+-                    break
+-            if version >= version_req:
+-                if (self.compiler.find_library_file(lib_dirs, 'z')):
+-                    exts.append( Extension('zlib', ['zlibmodule.c'],
+-                                           libraries = ['z']) )
++        exts.append(Extension('zlib', ['zlibmodule.c'], libraries = ['z']))
+ 
+         # Interface to the Expat XML parser
+         #
+@@ -609,7 +583,7 @@ def main():
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install
diff --git a/lang/python21/distinfo b/lang/python21/distinfo
index e78e3e31d56..727c3b0c88e 100644
--- a/lang/python21/distinfo
+++ b/lang/python21/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2003/06/06 18:14:11 drochner Exp $
+$NetBSD: distinfo,v 1.12 2004/05/16 20:01:59 minskim Exp $
 
 SHA1 (Python-2.1.3.tgz) = 7042a5c5fd60d334c0ac227885d68a4c305713b4
 Size (Python-2.1.3.tgz) = 6194432 bytes
 SHA1 (patch-aa) = 8273acc49a9eedad6e09685098178f3b7fb8f1c6
 SHA1 (patch-ab) = f87a4d5c76182ab27ba79b42f00e8a2ff63bcf2b
-SHA1 (patch-ac) = 397454551beaa8dd11e0a5c171cbdb4f4501a9a3
+SHA1 (patch-ac) = 6f3435e1e66c1a6232c76a3c008f540ccd98ea37
 SHA1 (patch-ad) = 769bcd7803723c8d538a74173792ffcc491fa414
 SHA1 (patch-af) = e17c20f83ba1219860a6aefd959364147c7963e1
 SHA1 (patch-ah) = 637dfe0cb4d031760f1085fb7921c0ae77158221
diff --git a/lang/python21/patches/patch-ac b/lang/python21/patches/patch-ac
index ce198446918..92eec8cc1c5 100644
--- a/lang/python21/patches/patch-ac
+++ b/lang/python21/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2002/04/09 04:23:23 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2004/05/16 20:01:59 minskim Exp $
 
---- setup.py.orig	Thu Dec 27 16:51:02 2001
+--- setup.py.orig	2001-12-27 15:51:02.000000000 -0600
 +++ setup.py
-@@ -145,11 +145,16 @@
+@@ -145,11 +145,16 @@ class PyBuildExt(build_ext):
          return platform
  
      def detect_modules(self):
@@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.4 2002/04/09 04:23:23 jlam Exp $
  
          # lib_dirs and inc_dirs are used to search for files;
          # if a file is found in one of those directories, it can
-@@ -265,13 +270,13 @@
+@@ -265,13 +270,13 @@ class PyBuildExt(build_ext):
          # These represent audio samples or images as strings:
  
          # Disabled on 64-bit platforms
@@ -42,7 +42,7 @@ $NetBSD: patch-ac,v 1.4 2002/04/09 04:23:23 jlam Exp $
  
          # readline
          if self.compiler.find_library_file(lib_dirs, 'readline'):
-@@ -296,14 +301,10 @@
+@@ -296,14 +301,10 @@ class PyBuildExt(build_ext):
          # socket(2)
          # Detect SSL support for the socket module
          ssl_incs = find_file('openssl/ssl.h', inc_dirs,
@@ -59,7 +59,7 @@ $NetBSD: patch-ac,v 1.4 2002/04/09 04:23:23 jlam Exp $
  
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -408,8 +409,8 @@
+@@ -408,8 +409,8 @@ class PyBuildExt(build_ext):
  
          if (self.compiler.find_library_file(lib_dirs, 'ncurses')):
              curses_libs = ['ncurses']
@@ -70,7 +70,7 @@ $NetBSD: patch-ac,v 1.4 2002/04/09 04:23:23 jlam Exp $
          elif (self.compiler.find_library_file(lib_dirs, 'curses')) and platform[:6] != 'darwin':
          	# OSX has an old Berkeley curses, not good enough for the _curses module.
              if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
-@@ -417,8 +418,8 @@
+@@ -417,8 +418,8 @@ class PyBuildExt(build_ext):
              else:
                  curses_libs = ['curses', 'termcap']
  
@@ -81,7 +81,32 @@ $NetBSD: patch-ac,v 1.4 2002/04/09 04:23:23 jlam Exp $
  
          # If the curses module is enabled, check for the panel module
          if (os.path.exists('Modules/_curses_panel.c') and
-@@ -609,7 +610,7 @@
+@@ -451,23 +452,7 @@ class PyBuildExt(build_ext):
+         # Andrew Kuchling's zlib module.
+         # This require zlib 1.1.3 (or later).
+         # See http://www.cdrom.com/pub/infozip/zlib/
+-        zlib_inc = find_file('zlib.h', [], inc_dirs)
+-        if zlib_inc is not None:
+-            zlib_h = zlib_inc[0] + '/zlib.h'
+-            version = '"0.0.0"'
+-            version_req = '"1.1.3"'
+-            fp = open(zlib_h)
+-            while 1:
+-                line = fp.readline()
+-                if not line:
+-                    break
+-                if line.find('#define ZLIB_VERSION', 0) == 0:
+-                    version = line.split()[2]
+-                    break
+-            if version >= version_req:
+-                if (self.compiler.find_library_file(lib_dirs, 'z')):
+-                    exts.append( Extension('zlib', ['zlibmodule.c'],
+-                                           libraries = ['z']) )
++        exts.append(Extension('zlib', ['zlibmodule.c'], libraries = ['z']))
+ 
+         # Interface to the Expat XML parser
+         #
+@@ -609,7 +594,7 @@ def main():
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install
diff --git a/lang/python22-pth/distinfo b/lang/python22-pth/distinfo
index 0bcf09064aa..e76f0030758 100644
--- a/lang/python22-pth/distinfo
+++ b/lang/python22-pth/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2003/06/06 17:31:20 drochner Exp $
+$NetBSD: distinfo,v 1.5 2004/05/16 20:01:59 minskim Exp $
 
 SHA1 (Python-2.2.3.tgz) = 177d587e77e0eaa14131ab0d0d0b470777de4400
 Size (Python-2.2.3.tgz) = 6709556 bytes
-SHA1 (patch-aa) = ea936cc5837c5455d1cb683c62963538212bdafa
+SHA1 (patch-aa) = d88a764938bba189e8ac509f370cc2c8525047a4
 SHA1 (patch-ab) = e5f86717b067a80dd76f14b8d7df4a943eb533e3
 SHA1 (patch-ae) = aefeec78e25631a6e9e2aa047dce12c9c522715e
 SHA1 (patch-af) = a2b23859941766319f638e40c49b5af3f504ef52
diff --git a/lang/python22-pth/patches/patch-aa b/lang/python22-pth/patches/patch-aa
index 506460ece81..639176ea37f 100644
--- a/lang/python22-pth/patches/patch-aa
+++ b/lang/python22-pth/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2003/06/06 17:31:20 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2004/05/16 20:01:59 minskim Exp $
 
---- setup.py.orig	2003-05-22 19:36:54.000000000 +0200
-+++ setup.py	2003-06-02 20:01:58.000000000 +0200
-@@ -210,11 +210,15 @@
+--- setup.py.orig	2003-05-22 12:36:54.000000000 -0500
++++ setup.py
+@@ -210,11 +210,15 @@ class PyBuildExt(build_ext):
          return platform
  
      def detect_modules(self):
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.2 2003/06/06 17:31:20 drochner Exp $
  
          try:
              have_unicode = unicode
-@@ -274,7 +278,7 @@
+@@ -274,7 +278,7 @@ class PyBuildExt(build_ext):
          if have_unicode:
              exts.append( Extension('unicodedata', ['unicodedata.c']) )
          # access to ISO C locale support
@@ -32,7 +32,7 @@ $NetBSD: patch-aa,v 1.2 2003/06/06 17:31:20 drochner Exp $
  
          # Modules with some UNIX dependencies -- on by default:
          # (If you have a really backward UNIX, select and socket may not be
-@@ -330,16 +334,16 @@
+@@ -330,16 +334,16 @@ class PyBuildExt(build_ext):
          # These represent audio samples or images as strings:
  
          # Disabled on 64-bit platforms
@@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.2 2003/06/06 17:31:20 drochner Exp $
              readline_libs = ['readline']
              if self.compiler.find_library_file(lib_dirs,
                                                   'ncurses'):
-@@ -363,14 +367,10 @@
+@@ -363,14 +367,10 @@ class PyBuildExt(build_ext):
          # socket(2)
          # Detect SSL support for the socket module
          ssl_incs = find_file('openssl/ssl.h', inc_dirs,
@@ -71,7 +71,7 @@ $NetBSD: patch-aa,v 1.2 2003/06/06 17:31:20 drochner Exp $
  
          if ssl_incs is not None:
              krb5_h = find_file('krb5.h', inc_dirs,
-@@ -413,9 +413,9 @@
+@@ -413,9 +413,9 @@ class PyBuildExt(build_ext):
                  exts.append( Extension('dbm', ['dbmmodule.c']) )
  
          # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
@@ -84,7 +84,7 @@ $NetBSD: patch-aa,v 1.2 2003/06/06 17:31:20 drochner Exp $
  
          # Berkeley DB interface.
          #
-@@ -469,9 +469,9 @@
+@@ -469,9 +469,9 @@ class PyBuildExt(build_ext):
          # FTP archive sites. One URL for it is:
          # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z
  
@@ -97,7 +97,7 @@ $NetBSD: patch-aa,v 1.2 2003/06/06 17:31:20 drochner Exp $
  
  
          # Unix-only modules
-@@ -498,8 +498,8 @@
+@@ -498,8 +498,8 @@ class PyBuildExt(build_ext):
  
          if (self.compiler.find_library_file(lib_dirs, 'ncurses')):
              curses_libs = ['ncurses']
@@ -108,7 +108,7 @@ $NetBSD: patch-aa,v 1.2 2003/06/06 17:31:20 drochner Exp $
          elif (self.compiler.find_library_file(lib_dirs, 'curses')
                and platform != 'darwin'):
                  # OSX has an old Berkeley curses, not good enough for
-@@ -509,8 +509,8 @@
+@@ -509,8 +509,8 @@ class PyBuildExt(build_ext):
              else:
                  curses_libs = ['curses', 'termcap']
  
@@ -119,7 +119,32 @@ $NetBSD: patch-aa,v 1.2 2003/06/06 17:31:20 drochner Exp $
  
          # If the curses module is enabled, check for the panel module
          if (module_enabled(exts, '_curses') and
-@@ -581,11 +581,11 @@
+@@ -544,23 +544,7 @@ class PyBuildExt(build_ext):
+         # Andrew Kuchling's zlib module.
+         # This require zlib 1.1.3 (or later).
+         # See http://www.cdrom.com/pub/infozip/zlib/
+-        zlib_inc = find_file('zlib.h', [], inc_dirs)
+-        if zlib_inc is not None:
+-            zlib_h = zlib_inc[0] + '/zlib.h'
+-            version = '"0.0.0"'
+-            version_req = '"1.1.3"'
+-            fp = open(zlib_h)
+-            while 1:
+-                line = fp.readline()
+-                if not line:
+-                    break
+-                if line.find('#define ZLIB_VERSION', 0) == 0:
+-                    version = line.split()[2]
+-                    break
+-            if version >= version_req:
+-                if (self.compiler.find_library_file(lib_dirs, 'z')):
+-                    exts.append( Extension('zlib', ['zlibmodule.c'],
+-                                           libraries = ['z']) )
++        exts.append(Extension('zlib', ['zlibmodule.c'], libraries = ['z']))
+ 
+         # Interface to the Expat XML parser
+         #
+@@ -581,11 +565,11 @@ class PyBuildExt(build_ext):
          else:
              expat_incs = find_file('xmlparse.h', inc_dirs, [])
  
@@ -136,7 +161,7 @@ $NetBSD: patch-aa,v 1.2 2003/06/06 17:31:20 drochner Exp $
  
          # Platform-specific libraries
          if platform == 'linux2':
-@@ -808,7 +808,7 @@
+@@ -808,7 +792,7 @@ def main():
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install
diff --git a/lang/python22/distinfo b/lang/python22/distinfo
index 439d083673b..07ad7d59c64 100644
--- a/lang/python22/distinfo
+++ b/lang/python22/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2003/06/06 17:31:18 drochner Exp $
+$NetBSD: distinfo,v 1.11 2004/05/16 20:01:59 minskim Exp $
 
 SHA1 (Python-2.2.3.tgz) = 177d587e77e0eaa14131ab0d0d0b470777de4400
 Size (Python-2.2.3.tgz) = 6709556 bytes
-SHA1 (patch-aa) = 325c94dfd73c7c85085f32b39990370d4053f375
+SHA1 (patch-aa) = e4d0ec82dc34b7c60fb926e10c205bdf0ea6cabd
 SHA1 (patch-ab) = aa06824d9f595a24aaddc96c83f31646f522ab09
 SHA1 (patch-ae) = aefeec78e25631a6e9e2aa047dce12c9c522715e
 SHA1 (patch-af) = a2b23859941766319f638e40c49b5af3f504ef52
diff --git a/lang/python22/patches/patch-aa b/lang/python22/patches/patch-aa
index 22592bad252..57a8cbe201a 100644
--- a/lang/python22/patches/patch-aa
+++ b/lang/python22/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2003/06/06 17:31:19 drochner Exp $
+$NetBSD: patch-aa,v 1.8 2004/05/16 20:01:59 minskim Exp $
 
---- setup.py.orig	2003-05-22 19:36:54.000000000 +0200
-+++ setup.py	2003-06-02 18:58:56.000000000 +0200
-@@ -210,11 +210,15 @@
+--- setup.py.orig	2003-05-22 12:36:54.000000000 -0500
++++ setup.py
+@@ -210,11 +210,15 @@ class PyBuildExt(build_ext):
          return platform
  
      def detect_modules(self):
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.7 2003/06/06 17:31:19 drochner Exp $
  
          try:
              have_unicode = unicode
-@@ -274,7 +278,7 @@
+@@ -274,7 +278,7 @@ class PyBuildExt(build_ext):
          if have_unicode:
              exts.append( Extension('unicodedata', ['unicodedata.c']) )
          # access to ISO C locale support
@@ -32,7 +32,7 @@ $NetBSD: patch-aa,v 1.7 2003/06/06 17:31:19 drochner Exp $
  
          # Modules with some UNIX dependencies -- on by default:
          # (If you have a really backward UNIX, select and socket may not be
-@@ -330,16 +334,16 @@
+@@ -330,16 +334,16 @@ class PyBuildExt(build_ext):
          # These represent audio samples or images as strings:
  
          # Disabled on 64-bit platforms
@@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.7 2003/06/06 17:31:19 drochner Exp $
              readline_libs = ['readline']
              if self.compiler.find_library_file(lib_dirs,
                                                   'ncurses'):
-@@ -363,14 +367,10 @@
+@@ -363,14 +367,10 @@ class PyBuildExt(build_ext):
          # socket(2)
          # Detect SSL support for the socket module
          ssl_incs = find_file('openssl/ssl.h', inc_dirs,
@@ -71,7 +71,7 @@ $NetBSD: patch-aa,v 1.7 2003/06/06 17:31:19 drochner Exp $
  
          if ssl_incs is not None:
              krb5_h = find_file('krb5.h', inc_dirs,
-@@ -413,9 +413,9 @@
+@@ -413,9 +413,9 @@ class PyBuildExt(build_ext):
                  exts.append( Extension('dbm', ['dbmmodule.c']) )
  
          # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
@@ -84,7 +84,7 @@ $NetBSD: patch-aa,v 1.7 2003/06/06 17:31:19 drochner Exp $
  
          # Berkeley DB interface.
          #
-@@ -469,9 +469,9 @@
+@@ -469,9 +469,9 @@ class PyBuildExt(build_ext):
          # FTP archive sites. One URL for it is:
          # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z
  
@@ -97,7 +97,7 @@ $NetBSD: patch-aa,v 1.7 2003/06/06 17:31:19 drochner Exp $
  
  
          # Unix-only modules
-@@ -498,8 +498,8 @@
+@@ -498,8 +498,8 @@ class PyBuildExt(build_ext):
  
          if (self.compiler.find_library_file(lib_dirs, 'ncurses')):
              curses_libs = ['ncurses']
@@ -108,7 +108,7 @@ $NetBSD: patch-aa,v 1.7 2003/06/06 17:31:19 drochner Exp $
          elif (self.compiler.find_library_file(lib_dirs, 'curses')
                and platform != 'darwin'):
                  # OSX has an old Berkeley curses, not good enough for
-@@ -509,8 +509,8 @@
+@@ -509,8 +509,8 @@ class PyBuildExt(build_ext):
              else:
                  curses_libs = ['curses', 'termcap']
  
@@ -119,7 +119,32 @@ $NetBSD: patch-aa,v 1.7 2003/06/06 17:31:19 drochner Exp $
  
          # If the curses module is enabled, check for the panel module
          if (module_enabled(exts, '_curses') and
-@@ -581,11 +581,11 @@
+@@ -544,23 +544,7 @@ class PyBuildExt(build_ext):
+         # Andrew Kuchling's zlib module.
+         # This require zlib 1.1.3 (or later).
+         # See http://www.cdrom.com/pub/infozip/zlib/
+-        zlib_inc = find_file('zlib.h', [], inc_dirs)
+-        if zlib_inc is not None:
+-            zlib_h = zlib_inc[0] + '/zlib.h'
+-            version = '"0.0.0"'
+-            version_req = '"1.1.3"'
+-            fp = open(zlib_h)
+-            while 1:
+-                line = fp.readline()
+-                if not line:
+-                    break
+-                if line.find('#define ZLIB_VERSION', 0) == 0:
+-                    version = line.split()[2]
+-                    break
+-            if version >= version_req:
+-                if (self.compiler.find_library_file(lib_dirs, 'z')):
+-                    exts.append( Extension('zlib', ['zlibmodule.c'],
+-                                           libraries = ['z']) )
++        exts.append(Extension('zlib', ['zlibmodule.c'], libraries = ['z']))
+ 
+         # Interface to the Expat XML parser
+         #
+@@ -581,11 +565,11 @@ class PyBuildExt(build_ext):
          else:
              expat_incs = find_file('xmlparse.h', inc_dirs, [])
  
@@ -136,7 +161,7 @@ $NetBSD: patch-aa,v 1.7 2003/06/06 17:31:19 drochner Exp $
  
          # Platform-specific libraries
          if platform == 'linux2':
-@@ -808,7 +808,7 @@
+@@ -808,7 +792,7 @@ def main():
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install