/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 499 by johnpye, Tue Apr 18 08:26:16 2006 UTC revision 500 by johnpye, Tue Apr 18 11:55:12 2006 UTC
# Line 291  if env['WITH_LOCAL_HELP']: Line 291  if env['WITH_LOCAL_HELP']:
291      print "WITH_LOCAL_HELP:",env['WITH_LOCAL_HELP']      print "WITH_LOCAL_HELP:",env['WITH_LOCAL_HELP']
292      subst_dict['@HELP_ROOT@']=env['WITH_LOCAL_HELP']      subst_dict['@HELP_ROOT@']=env['WITH_LOCAL_HELP']
293    
294    if with_python:
295        subst_dict['@ASCXX_USE_PYTHON@']="1"
296    
297  can_install = True  can_install = True
298  if platform.system()=='Windows':  if platform.system()=='Windows':
299      can_install = False      can_install = False
# Line 424  def CheckExtLib(context,libname,text,ext Line 427  def CheckExtLib(context,libname,text,ext
427      return is_ok      return is_ok
428    
429  #----------------  #----------------
430    # GCC VISIBILITY feature
431    
432    gccvisibility_test_text = """
433    #if __GNUC__ < 4
434    # error "Require GCC version 4 or newer"
435    #endif
436    
437    __attribute__ ((visibility("default"))) int x;
438    
439    int main(void){
440        extern int x;
441        x = 4;
442    }
443    """
444    
445    def CheckGccVisibility(context):
446        context.Message("Checking for GCC 'visibility' capability... ")
447        is_ok = context.TryCompile(gccvisibility_test_text,".c")
448        context.Result(is_ok)
449        return is_ok
450        
451    #----------------
452  # CUnit test  # CUnit test
453    
454  cunit_test_text = """  cunit_test_text = """
# Line 532  conf = Configure(env Line 557  conf = Configure(env
557          , 'CheckTclVersion' : CheckTclVersion          , 'CheckTclVersion' : CheckTclVersion
558          , 'CheckTk' : CheckTk          , 'CheckTk' : CheckTk
559          , 'CheckTkVersion' : CheckTkVersion          , 'CheckTkVersion' : CheckTkVersion
560            , 'CheckGccVisibility' : CheckGccVisibility
561  #       , 'CheckIsNan' : CheckIsNan  #       , 'CheckIsNan' : CheckIsNan
562  #       , 'CheckCppUnitConfig' : CheckCppUnitConfig  #       , 'CheckCppUnitConfig' : CheckCppUnitConfig
563      }      }
# Line 551  if not conf.CheckFunc('isnan'): Line 577  if not conf.CheckFunc('isnan'):
577      print "Didn't find isnan"      print "Didn't find isnan"
578  #   Exit(1)  #   Exit(1)
579    
580    # GCC visibility
581    
582    if conf.CheckGccVisibility():
583        conf.env['HAVE_GCCVISIBILITY']=True;
584    
585  # Tcl/Tk  # Tcl/Tk
586    
587  if conf.CheckTcl():  if conf.CheckTcl():
# Line 580  else: Line 611  else:
611    
612  # SWIG version  # SWIG version
613    
 if platform.system()=="Windows":  
     env['ENV']['SWIGFEATURES']='-O'  
 else:  
     env['ENV']['SWIGFEATURES']='-O'  
   
   
614  if not conf.CheckSwigVersion():  if not conf.CheckSwigVersion():
615      without_python_reason = 'SWIG >= 1.3.24 is required'      without_python_reason = 'SWIG >= 1.3.24 is required'
616      with_python = False      with_python = False

Legend:
Removed from v.499  
changed lines
  Added in v.500

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