/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2283 by jfenwick, Tue Feb 17 06:21:31 2009 UTC revision 2284 by gross, Fri Feb 20 02:10:59 2009 UTC
# Line 333  conf = Configure(clone_env(env)) Line 333  conf = Configure(clone_env(env))
333    
334  # Test that the compiler is working  # Test that the compiler is working
335  if not conf.CheckFunc('printf'):  if not conf.CheckFunc('printf'):
336    print "Cannot run C compiler '%s' (or libc is missing)" % (env['CC'])     print "Cannot run C compiler '%s' (or libc is missing)" % (env['CC'])
337    sys.exit(1)     sys.exit(1)
338    
339  if conf.CheckFunc('gethostname'):  if conf.CheckFunc('gethostname'):
340    conf.env.Append(CPPDEFINES = ['HAVE_GETHOSTNAME'])    conf.env.Append(CPPDEFINES = ['HAVE_GETHOSTNAME'])
# Line 355  conf.env.PrependENVPath('LD_LIBRARY_PATH Line 355  conf.env.PrependENVPath('LD_LIBRARY_PATH
355  if not conf.CheckCHeader('Python.h'):  if not conf.CheckCHeader('Python.h'):
356    print "Cannot find python include files (tried 'Python.h' in directory %s)" % (env['python_path'])    print "Cannot find python include files (tried 'Python.h' in directory %s)" % (env['python_path'])
357    sys.exit(1)    sys.exit(1)
358  if not conf.CheckFunc('Py_Main'):  if not conf.CheckFunc('Py_Exit'):
359    print "Cannot find python library method Py_Main (tried lib %s in directory %s)" % (env['python_libs'], env['python_lib_path'])    print "Cannot find python library method Py_Main (tried lib %s in directory %s)" % (env['python_libs'], env['python_lib_path'])
360    sys.exit(1)    sys.exit(1)
361    
362  ############ boost (required) ##################################  ############ boost (required) ##################################
363    
364  if not sysheaderopt =="":  if not sysheaderopt =="":
365    conf.env.Append(CCFLAGS=sysheaderopt+env['boost_path']+'boost')    conf.env.Append(CCFLAGS=sysheaderopt+os.path.join(env['boost_path'],'boost'))
366  else:  else:
367    conf.env.AppendUnique(CPPPATH     = [env['boost_path']])    conf.env.AppendUnique(CPPPATH     = [env['boost_path']])
368    
# Line 374  conf.env.PrependENVPath('LD_LIBRARY_PATH Line 374  conf.env.PrependENVPath('LD_LIBRARY_PATH
374  if not conf.CheckCXXHeader('boost/python.hpp'):  if not conf.CheckCXXHeader('boost/python.hpp'):
375    print "Cannot find boost include files (tried boost/python.hpp in directory %s)" % (env['boost_path'])    print "Cannot find boost include files (tried boost/python.hpp in directory %s)" % (env['boost_path'])
376    sys.exit(1)    sys.exit(1)
377    
378  if not conf.CheckFunc('PyObject_SetAttr'):  if not conf.CheckFunc('PyObject_SetAttr'):
379    print "Cannot find boost library method PyObject_SetAttr (tried method PyObject_SetAttr in library %s in directory %s)" % (env['boost_libs'], env['boost_lib_path'])    print "Cannot find boost library method PyObject_SetAttr (tried method PyObject_SetAttr in library %s in directory %s)" % (env['boost_libs'], env['boost_lib_path'])
380    sys.exit(1)    sys.exit(1)
# Line 476  if env['useumfpack']: Line 477  if env['useumfpack']:
477    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['amd_lib_path'])   # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['amd_lib_path'])   # The wrapper script needs to find these libs
478    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['blas_lib_path'])  # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['blas_lib_path'])  # The wrapper script needs to find these libs
479    
 if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0  
480  if env['useumfpack'] and not conf.CheckFunc('umfpack_di_symbolic'): env['useumfpack'] = 0  if env['useumfpack'] and not conf.CheckFunc('umfpack_di_symbolic'): env['useumfpack'] = 0
481  if env['useumfpack'] and not conf.CheckFunc('daxpy'): env['useumfpack'] = 0 # this does not work on shake73?  if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0
482    # if env['useumfpack'] and not conf.CheckFunc('daxpy'): env['useumfpack'] = 0 # this does not work on shake73?
483    
484  # Add UMFPACK to environment env if it was found  # Add UMFPACK to environment env if it was found
485  if env['useumfpack']:  if env['useumfpack']:
Legend:
Removed from v.2283  
changed lines
  Added in v.2284
  ViewVC Help
Powered by ViewVC 1.1.26