Changes in wscript [e625579:e836160]

File:

• wscript (modified) (4 diffs)

wscript

@@ -73 +73 @@
             help_str = 'compile with libavcodec (auto)',
             help_disable_str = 'disable libavcodec')
+    add_option_enable_disable(ctx, 'vorbis', default = None,
+            help_str = 'compile with libvorbis (auto)',
+            help_disable_str = 'disable libvorbis')
+    add_option_enable_disable(ctx, 'flac', default = None,
+            help_str = 'compile with libFLAC (auto)',
+            help_disable_str = 'disable libflac')
     add_option_enable_disable(ctx, 'samplerate', default = None,
             help_str = 'compile with samplerate (auto)',
             help_disable_str = 'disable samplerate')
-    add_option_enable_disable(ctx, 'rubberband', default = None,
-            help_str = 'compile with rubberband (auto)',
-            help_disable_str = 'disable rubberband')
     add_option_enable_disable(ctx, 'memcpy', default = True,
             help_str = 'use memcpy hacks (default)',
@@ -138 +141 @@
                 'samplerate',
                 'jack',
-                'rubberband',
                 'avcodec',
                 'blas',
                 'fftw3',
                 'fftw3f',
+                'flac',
+                'vorbis',
         ]
         for d in external_deps:
@@ -413 +417 @@
                 mandatory = ctx.options.enable_samplerate)
 
-    # check for librubberband
-    if (ctx.options.enable_rubberband != False):
-        ctx.check_cfg(package = 'rubberband', atleast_version = '1.3',
-                args = '--cflags --libs',
-                mandatory = ctx.options.enable_rubberband)
-
     # check for jack
     if (ctx.options.enable_jack != False):
@@ -467 +465 @@
                 ctx.define('HAVE_AVRESAMPLE', 1)
             ctx.define('HAVE_LIBAV', 1)
+
+    # check for vorbisenc
+    if (ctx.options.enable_vorbis != False):
+        ctx.check_cfg(package = 'vorbisenc vorbis ogg',
+                args = '--cflags --libs',
+                uselib_store = 'VORBISENC',
+                mandatory = ctx.options.enable_vorbis)
+
+    # check for flac
+    if (ctx.options.enable_flac != False):
+        ctx.check_cfg(package = 'flac',
+                args = '--cflags --libs',
+                uselib_store = 'FLAC',
+                mandatory = ctx.options.enable_flac)
 
     if (ctx.options.enable_wavread != False):