aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-10-17 13:33:18 +0200
committerDavid Robillard <d@drobilla.net>2019-10-17 13:33:18 +0200
commitba6f8e44590e19ff65274cf919e63f4035130ccb (patch)
tree07bfa754cba1f8448d9b804c865d430988327404
parent8ca84c20ab0f5b5e0a81c5d5d571376360b8a4c6 (diff)
downloadjalv-ba6f8e44590e19ff65274cf919e63f4035130ccb.tar.gz
jalv-ba6f8e44590e19ff65274cf919e63f4035130ccb.tar.bz2
jalv-ba6f8e44590e19ff65274cf919e63f4035130ccb.zip
Update autowaf
m---------waflib0
-rw-r--r--wscript104
2 files changed, 49 insertions, 55 deletions
diff --git a/waflib b/waflib
-Subproject 2f22513494d9c5092254c428eb487510d81a785
+Subproject de76b89dc1039e2f7d6c6b229a8950156b0e5c9
diff --git a/wscript b/wscript
index e534203..a994e3f 100644
--- a/wscript
+++ b/wscript
@@ -39,44 +39,39 @@ def configure(conf):
conf.load('autowaf', cache=True)
autowaf.set_c_lang(conf, 'c99')
- autowaf.check_pkg(conf, 'lv2', atleast_version='1.16.0', uselib_store='LV2')
- autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV',
- atleast_version='0.24.0', mandatory=True)
- autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
- atleast_version='0.24.0', mandatory=True)
- autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
- atleast_version='0.14.0', mandatory=True)
- autowaf.check_pkg(conf, 'sratom-0', uselib_store='SRATOM',
- atleast_version='0.6.0', mandatory=True)
+ conf.check_pkg('lv2 >= 1.16.0', uselib_store='LV2')
+ conf.check_pkg('lilv-0 >= 0.24.0', uselib_store='LILV')
+ conf.check_pkg('serd-0 >= 0.24.0', uselib_store='SERD')
+ conf.check_pkg('sord-0 >= 0.14.0', uselib_store='SORD')
+ conf.check_pkg('sratom-0 >= 0.6.0', uselib_store='SRATOM')
if Options.options.portaudio:
- autowaf.check_pkg(conf, 'portaudio-2.0', uselib_store='PORTAUDIO',
- atleast_version='2.0.0', mandatory=False)
+ conf.check_pkg('portaudio-2.0 >= 2.0.0',
+ uselib_store='PORTAUDIO', mandatory=False)
else:
- autowaf.check_pkg(conf, 'jack', uselib_store='JACK',
- atleast_version='0.120.0', mandatory=True)
+ conf.check_pkg('jack >= 0.120.0', uselib_store='JACK')
if not Options.options.no_gui and not Options.options.no_gtk:
if not Options.options.no_gtk2:
- autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK2',
- atleast_version='2.18.0', mandatory=False)
+ conf.check_pkg('gtk+-2.0 >= 2.18.0', uselib_store='GTK2',
+ mandatory=False)
if not Options.options.no_gtkmm:
- autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM2',
- atleast_version='2.20.0', mandatory=False)
+ conf.check_pkg('gtkmm-2.4 >= 2.20.0', uselib_store='GTKMM2',
+ mandatory=False)
if not Options.options.no_gtk3:
- autowaf.check_pkg(conf, 'gtk+-3.0', uselib_store='GTK3',
- atleast_version='3.0.0', mandatory=False)
+ conf.check_pkg('gtk+-3.0 >= 3.0.0', uselib_store='GTK3',
+ mandatory=False)
if not Options.options.no_gui and not Options.options.no_qt:
if not Options.options.no_qt4:
- autowaf.check_pkg(conf, 'QtGui', uselib_store='QT4',
- atleast_version='4.0.0', mandatory=False)
+ conf.check_pkg('QtGui >= 4.0.0', uselib_store='QT4',
+ mandatory=False)
if conf.env.HAVE_QT4:
if not conf.find_program('moc-qt4', var='MOC4', mandatory=False):
conf.find_program('moc', var='MOC4')
if not Options.options.no_qt5:
- autowaf.check_pkg(conf, 'Qt5Widgets', uselib_store='QT5',
- atleast_version='5.1.0', mandatory=False)
+ conf.check_pkg('Qt5Widgets >= 5.1.0', uselib_store='QT5',
+ mandatory=False)
if conf.env.HAVE_QT5:
if not conf.find_program('moc-qt5', var='MOC5', mandatory=False):
conf.find_program('moc', var='MOC5')
@@ -84,48 +79,47 @@ def configure(conf):
have_gui = (conf.env.HAVE_GTK2 or conf.env.HAVE_GTKMM2 or conf.env.HAVE_GTK3 or
conf.env.HAVE_QT4 or conf.env.HAVE_QT5)
if have_gui:
- autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL',
- atleast_version='0.10.0')
+ conf.check_pkg('suil-0 >= 0.10.0', uselib_store='SUIL')
if conf.env.HAVE_JACK:
- autowaf.check_function(
- conf, 'c', 'jack_port_type_get_buffer_size',
+ conf.check_function(
+ 'c', 'jack_port_type_get_buffer_size',
header_name = 'jack/jack.h',
define_name = 'HAVE_JACK_PORT_TYPE_GET_BUFFER_SIZE',
uselib = 'JACK',
mandatory = False)
- autowaf.check_function(conf, 'c', 'jack_set_property',
- header_name = 'jack/metadata.h',
- define_name = 'HAVE_JACK_METADATA',
- uselib = 'JACK',
- mandatory = False)
+ conf.check_function('c', 'jack_set_property',
+ header_name = 'jack/metadata.h',
+ define_name = 'HAVE_JACK_METADATA',
+ uselib = 'JACK',
+ mandatory = False)
defines = ['_POSIX_C_SOURCE=200809L']
- autowaf.check_function(conf, 'c', 'isatty',
- header_name = 'unistd.h',
- defines = defines,
- define_name = 'HAVE_ISATTY',
- mandatory = False)
-
- autowaf.check_function(conf, 'c', 'fileno',
- header_name = 'stdio.h',
- defines = defines,
- define_name = 'HAVE_FILENO',
- mandatory = False)
-
- autowaf.check_function(conf, 'c', 'mlock',
- header_name = 'sys/mman.h',
- defines = defines,
- define_name = 'HAVE_MLOCK',
- mandatory = False)
-
- autowaf.check_function(conf, 'c', 'sigaction',
- header_name = 'signal.h',
- defines = defines,
- define_name = 'HAVE_SIGACTION',
- mandatory = False)
+ conf.check_function('c', 'isatty',
+ header_name = 'unistd.h',
+ defines = defines,
+ define_name = 'HAVE_ISATTY',
+ mandatory = False)
+
+ conf.check_function('c', 'fileno',
+ header_name = 'stdio.h',
+ defines = defines,
+ define_name = 'HAVE_FILENO',
+ mandatory = False)
+
+ conf.check_function('c', 'mlock',
+ header_name = 'sys/mman.h',
+ defines = defines,
+ define_name = 'HAVE_MLOCK',
+ mandatory = False)
+
+ conf.check_function('c', 'sigaction',
+ header_name = 'signal.h',
+ defines = defines,
+ define_name = 'HAVE_SIGACTION',
+ mandatory = False)
if conf.is_defined('HAVE_ISATTY') and conf.is_defined('HAVE_FILENO'):
conf.env.append_unique('CFLAGS', ['-D_POSIX_C_SOURCE=200809L'])