[Scipy-svn] r4001 - branches/build_with_scons/scipy/sparse/linalg/eigen/arpack

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-03-07 06:39:46 -0600 (Fri, 07 Mar 2008)
New Revision: 4001

Modified:
   branches/build_with_scons/scipy/sparse/linalg/eigen/arpack/SConstruct
Log:
Prepend arpack lib for arpack module, because appending causes various crashes....

Modified: branches/build_with_scons/scipy/sparse/linalg/eigen/arpack/SConstruct
===================================================================
--- branches/build_with_scons/scipy/sparse/linalg/eigen/arpack/SConstruct	2008-03-07 00:50:27 UTC (rev 4000)
+++ branches/build_with_scons/scipy/sparse/linalg/eigen/arpack/SConstruct	2008-03-07 12:39:46 UTC (rev 4001)
@@ -17,7 +17,8 @@
 #-----------------
 # Checking Lapack
 #-----------------
-st = config.CheckLAPACK()
+st = config.CheckF77Clib()
+st = config.CheckLAPACK(autoadd = 1)
 if not st:
     raise RuntimeError("no lapack found, necessary for arpack module")
 
@@ -32,6 +33,7 @@
 src = [str(s) for s in arpack_src]
 
 env.AppendUnique(CPPPATH = pjoin('ARPACK', 'SRC'))
+env.AppendUnique(LIBPATH = env['build_dir'])
 arpack_lib = env.NumpyStaticExtLibrary('arpack', source = src)
 
 # Build _arpack extension
@@ -41,4 +43,5 @@
 env.NumpyFromFTemplate('arpack.pyf', 'arpack.pyf.src')
 wsrc = env.F2py(pjoin(env['build_dir'], '_arpackmodule.c'), 
                 pjoin(env['build_dir'], 'arpack.pyf'))
-env.NumpyPythonExtension('_arpack', source = wsrc, LIBS = arpack_lib)
+env.Prepend(LIBS = 'arpack')
+env.NumpyPythonExtension('_arpack', source = wsrc)