[Distutils] patch for config::finalize_options

Bastian Kleineidam calvin@cs.uni-sb.de
Thu Oct 12 11:12:02 2000


This patch fixes up any supplied command line options.

Bastian

diff -BurN --exclude=*.pyc distutils/distutils/command/config.py distutils.patched/distutils/command/config.py
--- distutils/distutils/command/config.py	Mon Oct  9 23:28:37 2000
+++ distutils.patched/distutils/command/config.py	Thu Oct 12 17:06:20 2000
@@ -14,6 +14,7 @@
 __revision__ = "$Id: config.py,v 1.4 2000/09/30 18:27:54 gward Exp $"
 
 import sys, os, string, re
+from types import *
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
 
@@ -69,7 +70,22 @@
         self.temp_files = []
 
     def finalize_options (self):
-        pass
+        """fix up types of option values"""
+        if self.include_dirs is None:
+            self.include_dirs = self.distribution.include_dirs or []
+        elif type(self.include_dirs) is StringType:
+            self.include_dirs = string.split(self.include_dirs, os.pathsep)
+
+        if self.libraries is None:
+            self.libraries = []
+        elif type(self.libraries) is StringType:
+            self.libraries = [self.libraries]
+
+        if self.library_dirs is None:
+            self.library_dirs = []
+        elif type(self.library_dirs) is StringType:
+            self.library_dirs = [self.library_dirs]
+
 
     def run (self):
         pass