[Numpy-svn] r4309 - in branches/numpy.scons/numpy: distutils/scons linalg

[numpy-svn at scipy.org]

Author: cdavid
Date: 2007-10-26 04:20:16 -0500 (Fri, 26 Oct 2007)
New Revision: 4309

Modified:
   branches/numpy.scons/numpy/distutils/scons/fortran_scons.py
   branches/numpy.scons/numpy/linalg/SConstruct
Log:
Start work on checking BLAS/LAPACK for numpy.linalg

Modified: branches/numpy.scons/numpy/distutils/scons/fortran_scons.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/fortran_scons.py	2007-10-26 09:17:29 UTC (rev 4308)
+++ branches/numpy.scons/numpy/distutils/scons/fortran_scons.py	2007-10-26 09:20:16 UTC (rev 4309)
@@ -1,4 +1,4 @@
-# Last Change: Tue Oct 09 04:00 PM 2007 J
+# Last Change: Fri Oct 26 06:00 PM 2007 J
 import os
 import sys
 import string
@@ -222,6 +222,8 @@
 
 def CheckF77Mangling(context):
     env = context.env
+    if not env.has_key('F77_DUMMY_MAIN'):
+        CheckF77DummyMain(context)
     context.Message('Checking %s name mangling - ' % env['F77'])
     res, mangler, u, du, c = _CheckFMangling(context, 'F77', env['F77_DUMMY_MAIN'], '.f')
     if res:

Modified: branches/numpy.scons/numpy/linalg/SConstruct
===================================================================
--- branches/numpy.scons/numpy/linalg/SConstruct	2007-10-26 09:17:29 UTC (rev 4308)
+++ branches/numpy.scons/numpy/linalg/SConstruct	2007-10-26 09:20:16 UTC (rev 4309)
@@ -1,11 +1,18 @@
-# Last Change: Thu Oct 18 09:00 PM 2007 J
+# Last Change: Fri Oct 26 05:00 PM 2007 J
 # vim:syntax=python
 from numpy.distutils.misc_util import get_numpy_include_dirs
 from numpy.distutils.scons import GetNumpyEnvironment, scons_get_paths
+from numpy.distutils.scons import CheckF77Mangling
 
 env = GetNumpyEnvironment(ARGUMENTS)
 env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
 
+config = env.NumpyConfigure(custom_tests = 
+    {'CheckF77Mangling' : CheckF77Mangling})
+
+config.CheckF77Mangling()
+config.Finish()
+
 sources = ['lapack_litemodule.c', 'zlapack_lite.c', 'dlapack_lite.c',
           'blas_lite.c', 'dlamch.c', 'f2c_lite.c']
 lapack_lite = env.NumpyPythonExtension('lapack_lite', source = sources)