Fixed absoft version pattern. Wrapped distutils gen_lib_options: fcompiler.library_dir_option may return a list.

1 files changed, 15 insertions, 0 deletions

diff --git a/scipy_distutils/ccompiler.py b/scipy_distutils/ccompiler.py
index 11963c31b..5d86c5807 100644
--- a/scipy_distutils/ccompiler.py
+++ b/scipy_distutils/ccompiler.py
@@ -256,6 +256,21 @@ def new_compiler (plat=None,
 
 ccompiler.new_compiler = new_compiler
 
+
+_distutils_gen_lib_options = gen_lib_options
+def gen_lib_options(compiler, library_dirs, runtime_library_dirs, libraries):
+    r = _distutils_gen_lib_options(compiler, library_dirs,
+                                   runtime_library_dirs, libraries)
+    lib_opts = []
+    for i in r:
+        if type(i) is type([]):
+            lib_opts.extend(i)
+        else:
+            lib_opts.append(i)
+    return lib_opts
+ccompiler.gen_lib_options = gen_lib_options
+
+
 ##Fix distutils.util.split_quoted:
 import re,string
 _wordchars_re = re.compile(r'[^\\\'\"%s ]*' % string.whitespace)