[Scipy-svn] r6667 - trunk/scipy/spatial

[scipy-svn at scipy.org]

Author: rgommers
Date: 2010-09-02 09:56:30 -0500 (Thu, 02 Sep 2010)
New Revision: 6667

Modified:
   trunk/scipy/spatial/SConscript
   trunk/scipy/spatial/setup.py
Log:
BUG: fix qhull build errors.

Modified: trunk/scipy/spatial/SConscript
===================================================================
--- trunk/scipy/spatial/SConscript	2010-09-02 14:55:56 UTC (rev 6666)
+++ trunk/scipy/spatial/SConscript	2010-09-02 14:56:30 UTC (rev 6667)
@@ -12,10 +12,10 @@
                                    join('src', 'distance.c')])
 
 # Build qhull
-src = [pjoin('qhull', 'src', s) for s in [
+src = [join('qhull', 'src', s) for s in [
     'geom.c', 'geom2.c', 'global.c', 'io.c', 'mem.c',
     'merge.c', 'poly.c', 'poly2.c', 'qset.c', 'user.c',
     'stat.c', 'qhull.c']]
 qhullsrc = env.DistutilsStaticExtLibrary('qhullsrc', source=src)
 
-env.NumpyPythonExtension('qhull', source = 'qhull.c', LIBS="qhullsrc")
+env.NumpyPythonExtension('qhull', source = 'qhull.c', LIBS=qhullsrc)

Modified: trunk/scipy/spatial/setup.py
===================================================================
--- trunk/scipy/spatial/setup.py	2010-09-02 14:55:56 UTC (rev 6666)
+++ trunk/scipy/spatial/setup.py	2010-09-02 14:56:30 UTC (rev 6667)
@@ -21,7 +21,10 @@
                        )
 
     lapack = dict(get_info('lapack_opt'))
-    libs = ['qhull'] + lapack.pop('libraries')
+    try:
+        libs = ['qhull'] + lapack.pop('libraries')
+    except KeyError:
+        libs = ['qhull']
     config.add_extension('qhull',
                          sources=['qhull.c'],
                          libraries=libs,