From: Jan Engelhardt Date: 2017-09-21 14:40:14.104177267 +0200 This reverts commit 70ce99868a47ce59c36178605848ddf121dc4c07. diff --git a/meson.build b/meson.build index a429847..61e1e4e 100644 --- a/meson.build +++ b/meson.build @@ -16,15 +16,10 @@ cc = meson.get_compiler('c') conf = configuration_data() mod_pkgconfig = import('pkgconfig') -sub_cdvar = subproject('c-dvar', version: '>=1') -sub_clist = subproject('c-list', version: '>=3') -sub_crbtree = subproject('c-rbtree', version: '>=3') -sub_csundry = subproject('c-sundry', version: '>=1') - -dep_cdvar = sub_cdvar.get_variable('libcdvar_dep') -dep_clist = sub_clist.get_variable('libclist_dep') -dep_crbtree = sub_crbtree.get_variable('libcrbtree_dep') -dep_csundry = sub_csundry.get_variable('libcsundry_dep') +dep_cdvar = dependency('libcdvar', version: '>=1', fallback: [ 'c-dvar', 'libcdvar_dep' ]) +dep_clist = dependency('libclist', version: '>=3', fallback: [ 'c-list', 'libclist_dep' ]) +dep_crbtree = dependency('libcrbtree', version: '>=3', fallback: [ 'c-rbtree', 'libcrbtree_dep' ]) +dep_csundry = dependency('libcsundry', version: '>=1', fallback: [ 'c-sundry', 'libcsundry_dep' ]) dep_math = cc.find_library('m') dep_thread = dependency('threads') dep_expat = dependency('expat')