Changeset dda6ba6


Ignore:
Timestamp:
Jul 10, 2012, 12:36:02 AM (12 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+
Children:
d62c32f
Parents:
c0d7cd6
Message:

wscript: udpate, disable fftw and swig by default

File:
1 edited

Legend:

Unmodified
Added
Removed
  • wscript

    rc0d7cd6 rdda6ba6  
    3737  opt.add_option('--enable-double', action='store_true', default=False,
    3838      help='compile aubio in double precision mode')
    39   opt.add_option('--disable-fftw', action='store_true', default=False,
     39  opt.add_option('--enable-fftw', action='store_true', default=False,
    4040      help='compile with ooura instead of fftw')
    41   opt.add_option('--disable-fftw3f', action='store_true', default=False,
     41  opt.add_option('--enable-fftw3f', action='store_true', default=False,
    4242      help='compile with fftw3 instead of fftw3f')
    4343  opt.add_option('--enable-complex', action='store_true', default=False,
     
    5151  opt.add_option('--enable-samplerate', action='store_true', default=False,
    5252      help='compile with libsamplerate support')
     53  opt.add_option('--enable-swig', action='store_true', default=False,
     54      help='compile with swig support (obsolete)')
    5355  opt.add_option('--with-target-platform', type='string',
    5456      help='set target platform for cross-compilation', dest='target_platform')
    55   opt.load('compiler_cc')
     57  opt.load('compiler_c')
    5658  opt.load('compiler_cxx')
    5759  opt.load('gnu_dirs')
     
    6062def configure(conf):
    6163  import Options
    62   conf.check_tool('compiler_cc')
     64  conf.check_tool('compiler_c')
    6365  conf.check_tool('compiler_cxx')
    6466  conf.check_tool('gnu_dirs') # helpful for autotools transition and .pc generation
     
    107109  if conf.env['PKGCONFIG']:
    108110
    109     if (Options.options.disable_fftw == False):
     111    if (Options.options.enable_fftw == True or Options.options.enable_fftw3f == True):
    110112      # one of fftwf or fftw3f
    111       if (Options.options.disable_fftw3f == True):
    112         conf.check_cfg(package = 'fftw3', atleast_version = '3.0.0',
     113      if (Options.options.enable_fftw3f == True):
     114        conf.check_cfg(package = 'fftw3f', atleast_version = '3.0.0',
    113115            args = '--cflags --libs')
     116        if (Options.options.enable_double == True):
     117          conf.msg('Warning', 'fftw3f enabled, but aubio compiled in double precision!')
    114118      else:
    115         # fftw3f not disabled, take most sensible one according to enable_double
     119        # fftw3f not enabled, take most sensible one according to enable_double
    116120        if (Options.options.enable_double == True):
    117121          conf.check_cfg(package = 'fftw3', atleast_version = '3.0.0',
     
    135139
    136140  # swig
    137   try:
    138     conf.find_program('swig', var='SWIG')
    139   except conf.errors.ConfigurationError:
    140     conf.to_log('swig was not found, not looking for (ignoring)')
    141   if conf.env['SWIG']:
    142     conf.check_tool('swig', tooldir='swig')
    143     conf.check_swig_version('1.3.27')
    144 
    145     # python
    146     if conf.find_program('python'):
    147       conf.check_tool('python')
    148       conf.check_python_version((2,4,2))
    149       conf.check_python_headers()
     141  if (Options.options.enable_swig == True):
     142    try:
     143      conf.find_program('swig', var='SWIG')
     144    except conf.errors.ConfigurationError:
     145      conf.to_log('swig was not found, not looking for (ignoring)')
     146
     147    if conf.env['SWIG']:
     148      conf.check_tool('swig')
     149      conf.check_swig_version()
     150
     151      # python
     152      if conf.find_program('python'):
     153        conf.check_tool('python')
     154        conf.check_python_version((2,4,2))
     155        conf.check_python_headers()
    150156
    151157  # check support for C99 __VA_ARGS__ macros
     
    180186  if bld.env['SWIG']:
    181187    if bld.env['PYTHON']:
    182       bld.add_subdirs('python/aubio python')
     188      bld.add_subdirs('python')
    183189
    184190  # create the aubio.pc file for pkg-config
Note: See TracChangeset for help on using the changeset viewer.