View | Details | Raw Unified | Return to bug 1381
Collapse All | Expand All

(-)a/src/openflow/wscript (-9 / +1 lines)
 Lines 2-24    Link Here 
2 

          2
          

        

        

          3
          
import os

          3
          
import os

        

        

          4
          
import Options

          4
          
import Options

        

            

              
              
              5
              
import Logs

            

        

          5
          
from waflib.Errors import WafError

          6
          
from waflib.Errors import WafError

        

        

          6
          

          7
          

        

        

          7
          
def options(opt):

          8
          
def options(opt):

        

        

          8
          
    opt.add_option('--with-openflow',

          9
          
    opt.add_option('--with-openflow',

        

        

          9
          
		   help=('Path to OFSID source for NS-3 OpenFlow Integration support'),

          10
          
		   help=('Path to OFSID source for NS-3 OpenFlow Integration support'),

        

        

          10
          
		   default='', dest='with_openflow')

          11
          
		   default='', dest='with_openflow')

        

            

              11
              
    opt.tool_options('boost', tooldir=["waf-tools"])

              
              
            

        

          12
          

          12
          

        

        

          13
          
def configure(conf):

          13
          
def configure(conf):

        

            

              14
              
    try:

              
              
            

            

              15
              
        conf.check_tool('boost')

            

            

              16
              
        conf.check_boost(lib='signals filesystem')

            

            

              17
              
        if not conf.env.LIB_BOOST:

            

            

              18
              
            conf.check_boost(lib='signals filesystem', libpath="/usr/lib64")

            

            

              19
              
    except WafError:

            

            

              20
              
        conf.env['LIB_BOOST'] = []

            

            

              21
              

            

        

          22
          
    if not conf.env.LIB_BOOST:

          14
          
    if not conf.env.LIB_BOOST:

        

        

          23
          
	conf.report_optional_feature("openflow", "NS-3 OpenFlow Integration", False,

          15
          
	conf.report_optional_feature("openflow", "NS-3 OpenFlow Integration", False,

        

        

          24
          
				     "Required boost libraries not found")

          16
          
				     "Required boost libraries not found")

        



(-)a/wscript
      (-1 / +9 lines)




  

    

    

       Lines 125-130
      def options(opt): 
    
  Link Here 
    

  

        

          125
          
    opt.load('compiler_cxx')

          125
          
    opt.load('compiler_cxx')

        

        

          126
          
    opt.load('cflags')

          126
          
    opt.load('cflags')

        

        

          127
          
    opt.load('gnu_dirs')

          127
          
    opt.load('gnu_dirs')

        

            

              
              
              128
              
    opt.tool_options('boost', tooldir=["waf-tools"])

            

        

          128
          

          129
          

        

        

          129
          
    opt.add_option('--cwd',

          130
          
    opt.add_option('--cwd',

        

        

          130
          
                   help=('Set the working directory for a program.'),

          131
          
                   help=('Set the working directory for a program.'),

        

  

    

    

       Lines 364-369
      def configure(conf): 
    
  Link Here 
    

  

        

          364
          
                conf.report_optional_feature("static", "Static build", False,

          365
          
                conf.report_optional_feature("static", "Static build", False,

        

        

          365
          
                                             "Link flag -Wl,--whole-archive,-Bstatic does not work")

          366
          
                                             "Link flag -Wl,--whole-archive,-Bstatic does not work")

        

        

          366
          

          367
          

        

            

              
              
              368
              
    try:

            

            

              369
              
        conf.check_tool('boost')

            

            

              370
              
        conf.check_boost(lib='signals filesystem iostreams regex')

            

            

              371
              
        if not conf.env.LIB_BOOST:

            

            

              372
              
            conf.check_boost(lib='signals filesystem iostreams regex', libpath="/usr/lib64")

            

            

              373
              
    except WafError:

            

            

              374
              
        conf.env['LIB_BOOST'] = []

            

            

              375
              

            

        

          367
          
    # Set this so that the lists won't be printed at the end of this

          376
          
    # Set this so that the lists won't be printed at the end of this

        

        

          368
          
    # configure command.

          377
          
    # configure command.

        

        

          369
          
    conf.env['PRINT_BUILT_MODULES_AT_END'] = False

          378
          
    conf.env['PRINT_BUILT_MODULES_AT_END'] = False

        

            

              370
              
- 

              
              
            






  

  Return to bug 1381