patch that copies headers only if --static is

specified, also works with python 2.3.

Tested with:
    LINUX: python setup.py build --static --static-deps install
    WINDOWS: python setup.py bdist_wininst --static

1 files changed, 15 insertions, 3 deletions

diff --git a/buildlibxml.py b/buildlibxml.py
index bfcf3e41..acef12f3 100644
--- a/buildlibxml.py
+++ b/buildlibxml.py
@@ -115,7 +115,7 @@ def download_libiconv(dest_dir, version=None):
     return download_library(dest_dir, LIBICONV_LOCATION, 'libiconv',
                             version_re, filename, version=version)
 
-def download_library(dest_dir, location, name, version_re, filename, 
+def download_library(dest_dir, location, name, version_re, filename,
                      version=None):
     if version is None:
         try:
@@ -227,11 +227,23 @@ def unpack_tarball(tar_filename, dest):
     return os.path.join(dest, base_dir)
 
 def call_subprocess(cmd, **kw):
-    import subprocess
+    try:
+        from subprocess import proc_call
+    except ImportError:
+        # no subprocess for Python 2.3
+        def proc_call(cmd, **kwargs):
+            cwd = kwargs.get('cwd', '.')
+            old_cwd = os.getcwd()
+            try:
+                os.chdir(cwd)
+                return os.system(' '.join(cmd))
+            finally:
+                os.chdir(old_cwd)
+
     cwd = kw.get('cwd', '.')
     cmd_desc = ' '.join(cmd)
     log.info('Running "%s" in %s' % (cmd_desc, cwd))
-    returncode = subprocess.call(cmd, **kw)
+    returncode = proc_call(cmd, **kw)
     if returncode:
         raise Exception('Command "%s" returned code %s' % (cmd_desc, returncode))