Bastian Kleineidam: fix up any supplied command-line options.

1 files changed, 16 insertions, 1 deletions

diff --git a/Lib/distutils/command/config.py b/Lib/distutils/command/config.py
index a13055c..18d7992 100644
--- a/Lib/distutils/command/config.py
+++ b/Lib/distutils/command/config.py
@@ -14,6 +14,7 @@ this header file lives".
 __revision__ = "$Id$"
 
 import sys, os, string, re
+from types import *
 from distutils.core import Command
 from distutils.errors import DistutilsExecError
 
@@ -69,7 +70,21 @@ class config (Command):
         self.temp_files = []
 
     def finalize_options (self):
-        pass
+        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 = string.split(self.library_dirs, os.pathsep)
+
 
     def run (self):
         pass