[Scipy-svn] r4213 - branches/refactor_fft/scipy/fftpack

scipy-svn at scipy.org scipy-svn at scipy.org
Mon May 5 02:52:32 EDT 2008


Author: cdavid
Date: 2008-05-05 01:52:28 -0500 (Mon, 05 May 2008)
New Revision: 4213

Modified:
   branches/refactor_fft/scipy/fftpack/SConstruct
Log:
Detect F77 runtime in fftpack scons script, because we will need it when using c++.

Modified: branches/refactor_fft/scipy/fftpack/SConstruct
===================================================================
--- branches/refactor_fft/scipy/fftpack/SConstruct	2008-05-04 13:25:43 UTC (rev 4212)
+++ branches/refactor_fft/scipy/fftpack/SConstruct	2008-05-05 06:52:28 UTC (rev 4213)
@@ -1,10 +1,11 @@
-# Last Change: Sat May 03 02:00 PM 2008 J
+# Last Change: Mon May 05 03:00 PM 2008 J
 # vim:syntax=python
 from os.path import join as pjoin
 
 from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment, write_info
 from numscons import CheckFFT, IsMKL, IsFFTW2, IsFFTW3
+from numscons import CheckF77Clib
 
 env = GetNumpyEnvironment(ARGUMENTS)
 env.Tool('numpyf2py')
@@ -13,8 +14,11 @@
 env.AppendUnique(CPPPATH = env['F2PYINCLUDEDIR'])
 
 # Check fft implementation
-config = env.NumpyConfigure(custom_tests = {'CheckFFT': CheckFFT})
+config = env.NumpyConfigure(custom_tests = {'CheckFFT': CheckFFT,
+                            'CheckF77Clib' : CheckF77Clib})
 has_fft = config.CheckFFT()
+if not config.CheckF77Clib():
+    raise Exception("Could not get f77/c++ link information")
 config.Finish()
 write_info(env)
 




More information about the Scipy-svn mailing list