/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1339 by jpye, Sat Mar 10 13:57:01 2007 UTC revision 1357 by jpye, Fri Mar 23 02:57:39 2007 UTC
# Line 1510  conf = Configure(env Line 1510  conf = Configure(env
1510  #   , config_h = "config.h"  #   , config_h = "config.h"
1511  )  )
1512    
1513    def sconsversioncheck():
1514    
1515    #   uncomment the following line to skip the version check:
1516    #   return 1
1517    
1518        import SCons
1519        v = SCons.__version__.split(".")
1520        if v[0] != '0':
1521            return 0
1522        if v[1] != '96':
1523            return 0
1524        micro = int(v[2])
1525        if micro == 92 or micro == 93:
1526            return 1;
1527        return 0
1528    
1529    if not sconsversioncheck():
1530        print "Scons version is not OK. Please try version 0.96.92 or 0.96.93,"
1531        print "or consult the developers in the case of newer versions. Modify"
1532        print "the function 'sconsversioncheck' in the file SConstruct if you"
1533        print "want to *force* SCons to continue."
1534        Exit(1)
1535    
1536  # stdio -- just to check that compiler is behaving  # stdio -- just to check that compiler is behaving
1537    
1538  if not conf.CheckHeader('stdio.h'):  if not conf.CheckHeader('stdio.h'):
# Line 1704  if need_fortran: Line 1727  if need_fortran:
1727      if detect_fortran:      if detect_fortran:
1728          # For some reason, g77 doesn't get detected properly on MinGW          # For some reason, g77 doesn't get detected properly on MinGW
1729          if not env.has_key('F77') and not env.has_key('FORTRAN'):          if not env.has_key('F77') and not env.has_key('FORTRAN'):
1730                print "Fixing detection of F77 on MinGW...(?)"
1731              conf.env.Replace(F77=detect_fortran)              conf.env.Replace(F77=detect_fortran)
1732              conf.env.Replace(F77COM='$F77 $F77FLAGS -c -o $TARGET $SOURCE')              conf.env.Replace(F77COM='$F77 $F77FLAGS -c -o $TARGET $SOURCE')
1733              conf.env.Replace(F77FLAGS='')              conf.env.Replace(F77FLAGS='')

Legend:
Removed from v.1339  
changed lines
  Added in v.1357

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