Fix font sizing in the big clock.

[ardour.git] / wscript

diff --git a/wscript b/wscript
index b27cb9e4933a70f65c9256ca2be7c2e884fd3795..6ac723a313bdccc84c1cac78392cc99c98684725 100644 (file)
--- a/wscript
+++ b/wscript
@@ -384,7 +384,7 @@ def configure(conf):
        autowaf.configure(conf)
 
        gcc_versions = fetch_gcc_version()
-        if Options.options.debug and gcc_versions[0] == '4' and gcc_versions[1] > '4':
+        if not Options.options.debug and gcc_versions[0] == '4' and gcc_versions[1] > '4':
                 print 'Version 4.5 of gcc is not ready for use when compiling Ardour with optimization.'
                 print 'Please use a different version or re-configure with --debug'
                 exit (1)
@@ -498,6 +498,9 @@ def configure(conf):
        # Fix utterly braindead FLAC include path to not smash assert.h
        conf.env['CPPPATH_FLAC'] = []
 
+       conf.check_cc(function_name='dlopen', header_name='dlfcn.h', linkflags='-ldl', uselib_store='DL')
+       conf.check_cc(function_name='curl_global_init', header_name='curl/curl.h', linkflags='-lcurl', uselib_store='CURL')
+
        # Tell everyone that this is a waf build
 
        conf.env.append_value('CCFLAGS', '-DWAF_BUILD')
@@ -556,8 +559,7 @@ def configure(conf):
        autowaf.display_msg(conf, 'Wiimote Support', opts.wiimote)
        if opts.wiimote:
                conf.define('WIIMOTE',1)
-       if opts.windows_key:
-               conf.define('WINDOWS_KEY', opts.windows_key)
+       conf.define('WINDOWS_KEY', opts.windows_key)
        autowaf.display_msg(conf, 'Windows Key', opts.windows_key)
         conf.env['PROGRAM_NAME'] = opts.program_name
         autowaf.display_msg(conf, 'Program Name', opts.program_name)