summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-10-17 13:30:14 +0200
committerDavid Robillard <d@drobilla.net>2019-10-17 13:30:14 +0200
commitc1561161622e207bf4d3ebe8dc8602358775ef8a (patch)
treeaacad4826c424adf6c28789ce1e849a883e06912
parent4f490edeb084aa9af8f8bb53dcd56d442b9446cf (diff)
downloadlilv-c1561161622e207bf4d3ebe8dc8602358775ef8a.tar.gz
lilv-c1561161622e207bf4d3ebe8dc8602358775ef8a.tar.bz2
lilv-c1561161622e207bf4d3ebe8dc8602358775ef8a.zip
Update autowaf
m---------waflib0
-rw-r--r--wscript65
2 files changed, 30 insertions, 35 deletions
diff --git a/waflib b/waflib
-Subproject 2f22513494d9c5092254c428eb487510d81a785
+Subproject de76b89dc1039e2f7d6c6b229a8950156b0e5c9
diff --git a/wscript b/wscript
index a9b7bb1..7658aa0 100644
--- a/wscript
+++ b/wscript
@@ -83,16 +83,11 @@ def configure(conf):
if not conf.env.BUILD_SHARED and not conf.env.BUILD_STATIC:
conf.fatal('Neither a shared nor a static build requested')
- autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
- atleast_version='1.16.0', mandatory=True)
- autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
- atleast_version='0.30.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.4.0', mandatory=True)
- autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE',
- atleast_version='1.0.0', mandatory=False)
+ conf.check_pkg('lv2 >= 1.16.0', uselib_store='LV2')
+ conf.check_pkg('serd-0 >= 0.30.0', uselib_store='SERD')
+ conf.check_pkg('sord-0 >= 0.14.0', uselib_store='SORD')
+ conf.check_pkg('sratom-0 >= 0.4.0', uselib_store='SRATOM')
+ conf.check_pkg('sndfile >= 1.0.0', uselib_store='SNDFILE', mandatory=False)
defines = ['_POSIX_C_SOURCE=200809L', '_BSD_SOURCE', '_DEFAULT_SOURCE']
if conf.env.DEST_OS == 'darwin':
@@ -102,31 +97,31 @@ def configure(conf):
if conf.env.DEST_OS == 'darwin' or conf.env.DEST_OS == 'win32':
rt_lib = []
- autowaf.check_function(conf, 'c', 'lstat',
- header_name = ['sys/stat.h'],
- defines = defines,
- define_name = 'HAVE_LSTAT',
- mandatory = False)
-
- autowaf.check_function(conf, 'c', 'flock',
- header_name = 'sys/file.h',
- defines = defines,
- define_name = 'HAVE_FLOCK',
- 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', 'clock_gettime',
- header_name = ['sys/time.h','time.h'],
- defines = ['_POSIX_C_SOURCE=200809L'],
- define_name = 'HAVE_CLOCK_GETTIME',
- uselib_store = 'CLOCK_GETTIME',
- lib = rt_lib,
- mandatory = False)
+ conf.check_function('c', 'lstat',
+ header_name = ['sys/stat.h'],
+ defines = defines,
+ define_name = 'HAVE_LSTAT',
+ mandatory = False)
+
+ conf.check_function('c', 'flock',
+ header_name = 'sys/file.h',
+ defines = defines,
+ define_name = 'HAVE_FLOCK',
+ mandatory = False)
+
+ conf.check_function('c', 'fileno',
+ header_name = 'stdio.h',
+ defines = defines,
+ define_name = 'HAVE_FILENO',
+ mandatory = False)
+
+ conf.check_function('c', 'clock_gettime',
+ header_name = ['sys/time.h','time.h'],
+ defines = ['_POSIX_C_SOURCE=200809L'],
+ define_name = 'HAVE_CLOCK_GETTIME',
+ uselib_store = 'CLOCK_GETTIME',
+ lib = rt_lib,
+ mandatory = False)
conf.check_cc(define_name = 'HAVE_LIBDL',
lib = 'dl',