/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 585 by johnpye, Tue May 9 06:21:18 2006 UTC revision 586 by johnpye, Thu May 11 00:47:54 2006 UTC
# Line 750  conf.env['HAVE_LEX']=True Line 750  conf.env['HAVE_LEX']=True
750    
751  # Tcl/Tk  # Tcl/Tk
752    
753  if conf.CheckTcl():  if with_tcltk:
754      if with_tcltk and conf.CheckTclVersion():      if conf.CheckTcl():
755          if conf.CheckTk():          if conf.CheckTclVersion():
756              if with_tcltk and conf.CheckTkVersion():              if conf.CheckTk():
757                  if env['STATIC_TCLTK']:                  if with_tcltk and conf.CheckTkVersion():
758                      if conf.CheckTkTable():                      if env['STATIC_TCLTK']:
759                          pass                          if conf.CheckTkTable():
760                      else:                              pass
761                          without_tcltk_reason = "TkTable not found"                          else:
762                          with_tcltk = False                              without_tcltk_reason = "TkTable not found"
763                                with_tcltk = False
764                    else:
765                        without_tcltk_reason = "Require Tk version <= 8.4. See 'scons -h'"
766                        with_tcltk = False
767              else:              else:
768                  without_tcltk_reason = "Require Tk version <= 8.4. See 'scons -h'"                  without_tcltk_reason = "Tk not found."
769                  with_tcltk = False                  with_tcltk = False
770          else:          else:
771              without_tcltk_reason = "Tk not found."              without_tcltk_reason = "Require Tcl <= 8.4 Tcl."
772              with_tcltk = False              with_tcltk = False
773    
774      else:      else:
775          without_tcltk_reason = "Require Tcl <= 8.4 Tcl."          without_tcltk_reason = "Tcl not found."
776          with_tcltk = False          with_tcltk = False
777    
 else:  
     without_tcltk_reason = "Tcl not found."  
     with_tcltk = False  
   
778  if env['STATIC_TCLTK']:  if env['STATIC_TCLTK']:
779      conf.CheckX11()      conf.CheckX11()
780    
# Line 877  subst_dict = { Line 878  subst_dict = {
878      , '@WEBHELPROOT@':'http://pye.dyndns.org/ascend/manual/'      , '@WEBHELPROOT@':'http://pye.dyndns.org/ascend/manual/'
879      , '@ASC_SHLIBSUFFIX@':env['SHLIBSUFFIX']      , '@ASC_SHLIBSUFFIX@':env['SHLIBSUFFIX']
880      , '@ASC_SHLIBPREFIX@':env['SHLIBPREFIX']      , '@ASC_SHLIBPREFIX@':env['SHLIBPREFIX']
881        , '@ASC_TK_SUBDIR_NAME@' : 'tcltk'
882  }  }
883    
884  if env['WITH_LOCAL_HELP']:  if env['WITH_LOCAL_HELP']:

Legend:
Removed from v.585  
changed lines
  Added in v.586

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