/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 549 by johnpye, Fri Apr 28 10:01:39 2006 UTC revision 551 by johnpye, Sat Apr 29 04:19:17 2006 UTC
# Line 28  else: Line 28  else:
28      default_tcl = os.path.expanduser("~/activetcl")      default_tcl = os.path.expanduser("~/activetcl")
29      default_tcl_libpath = "$TCL/lib"          default_tcl_libpath = "$TCL/lib"    
30    
31        if not os.path.isdir(default_tcl):
32            default_tcl = '/usr'
33    
34  # Package linking option  # Package linking option
35  opts.Add(EnumOption(  opts.Add(EnumOption(
36      'PACKAGE_LINKING'      'PACKAGE_LINKING'
# Line 313  opts.Save('options.cache',env) Line 316  opts.Save('options.cache',env)
316    
317  Help(opts.GenerateHelpText(env))  Help(opts.GenerateHelpText(env))
318    
319  with_tcltk_gui = (env['WITH_TCLTK']==True)  with_tcltk = env.get('WITH_TCLTK')
320  without_tcltk_reason = "disabled by options/config.py"  without_tcltk_reason = "disabled by options/config.py"
321    
322  with_python = (env['WITH_PYTHON']==True)  with_python = env.get('WITH_PYTHON')
323  without_python_reason = "disabled by options/config.py"  without_python_reason = "disabled by options/config.py"
324    
325  with_cunit_tests = env['WITH_CUNIT_TESTS']  with_cunit_tests = env.get('WITH_CUNIT_TESTS')
326  without_cunit_reason = "not requested"  without_cunit_reason = "not requested"
327    
328  #print "SOLVERS:",env['WITH_SOLVERS']  #print "SOLVERS:",env['WITH_SOLVERS']
# Line 713  conf.env['HAVE_LEX']=True Line 716  conf.env['HAVE_LEX']=True
716  # Tcl/Tk  # Tcl/Tk
717    
718  if conf.CheckTcl():  if conf.CheckTcl():
719      if with_tcltk_gui and conf.CheckTclVersion():      if with_tcltk and conf.CheckTclVersion():
720          if conf.CheckTk():          if conf.CheckTk():
721              if with_tcltk_gui and conf.CheckTkVersion():              if with_tcltk and conf.CheckTkVersion():
722                  if conf.CheckTkTable():                  if conf.CheckTkTable():
723                      pass                      pass
724                  else:                  else:
725                      without_tcltk_reason = "TkTable not found"                      without_tcltk_reason = "TkTable not found"
726                      with_tcltk_gui = False                      with_tcltk = False
727              else:              else:
728                  without_tcltk_reason = "Require Tk version <= 8.3. See 'scons -h'"                  without_tcltk_reason = "Require Tk version <= 8.3. See 'scons -h'"
729                  with_tcltk_gui = False                  with_tcltk = False
730          else:          else:
731              without_tcltk_reason = "Tk not found."              without_tcltk_reason = "Tk not found."
732              with_tcltk_gui = False              with_tcltk = False
733      else:      else:
734          without_tcltk_reason = "Require Tcl <= 8.3 Tcl."          without_tcltk_reason = "Require Tcl <= 8.3 Tcl."
735          with_tcltk_gui = False          with_tcltk = False
736    
737  else:  else:
738      without_tcltk_reason = "Tcl not found."      without_tcltk_reason = "Tcl not found."
739      with_tcltk_gui = False      with_tcltk = False
740    
741  if env['STATIC_TCLTK']:  if env['STATIC_TCLTK']:
742      conf.CheckX11()      conf.CheckX11()
# Line 761  if with_cunit_tests: Line 764  if with_cunit_tests:
764  # BLAS  # BLAS
765    
766  need_blas=False  need_blas=False
767  if with_tcltk_gui:  if with_tcltk:
768      need_blas=True      need_blas=True
769  if need_blas:  if need_blas:
770      if conf.CheckLib('blas'):      if conf.CheckLib('blas'):
         print "FOUND BLAS"  
771          with_local_blas = False          with_local_blas = False
772          without_local_blas_reason = "Found BLAS installed on system"          without_local_blas_reason = "Found BLAS installed on system"
773      else:      else:
         print "DIDN'T FIND BLAS"  
774          with_local_blas = True          with_local_blas = True
775          need_fortran = True          need_fortran = True
776    
# Line 1155  if env['DEBUG']: Line 1156  if env['DEBUG']:
1156  #-------------  #-------------
1157  # TCL/TK GUI  # TCL/TK GUI
1158    
1159  if with_tcltk_gui:  if with_tcltk:
1160      if with_local_blas:      if with_local_blas:
1161          env.SConscript(['blas/SConscript'],'env')          env.SConscript(['blas/SConscript'],'env')
1162      else:      else:

Legend:
Removed from v.549  
changed lines
  Added in v.551

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22