[Numpy-svn] r4299 - branches/numpy.scons/numpy/core
numpy-svn at scipy.org
numpy-svn at scipy.org
Fri Oct 26 00:53:34 EDT 2007
Author: cdavid
Date: 2007-10-25 23:53:31 -0500 (Thu, 25 Oct 2007)
New Revision: 4299
Modified:
branches/numpy.scons/numpy/core/SConstruct
Log:
Trivial changes in numpy.core SConstruct.
Modified: branches/numpy.scons/numpy/core/SConstruct
===================================================================
--- branches/numpy.scons/numpy/core/SConstruct 2007-10-26 04:52:21 UTC (rev 4298)
+++ branches/numpy.scons/numpy/core/SConstruct 2007-10-26 04:53:31 UTC (rev 4299)
@@ -17,6 +17,9 @@
env = GetNumpyEnvironment(ARGUMENTS)
env.Append(CPPPATH = [get_python_inc()])
if os.name == 'nt':
+ # NT needs the pythonlib to run any code importing Python.h, including
+ # simple code using only typedef and so on, so we need it for configuration
+ # checks
env.AppendUnique(LIBPATH = [get_pythonlib_dir()])
#=======================
@@ -25,8 +28,6 @@
# XXX: separate env for configuration
config = env.NumpyConfigure(custom_tests = {'CheckBrokenMathlib' : CheckBrokenMathlib,
'CheckMathlib' : CheckMathlib,
- 'CheckMKL' : CheckMKL,
- 'CheckATLAS' : CheckATLAS,
'CheckCBLAS' : CheckCBLAS,
'NumpyCheckLib' : NumpyCheckLib})
@@ -83,7 +84,6 @@
('rint', 'HAVE_RINT'),
]
-# TODO: getting the math lib automatically ? Having a list ?
# TODO: checklib vs checkfunc ?
mlibs = [[], ['m'], ['cpml']]
mathlib = os.environ.get('MATHLIB')
More information about the Numpy-svn
mailing list