diff --git a/include/libxml/meson.build b/include/libxml/meson.build index 4355e31c..2b2cfb78 100644 --- a/include/libxml/meson.build +++ b/include/libxml/meson.build @@ -10,12 +10,12 @@ xmlversion_h.set10('WITH_DEBUG', want_debug) xmlversion_h.set10('WITH_FTP', want_ftp) xmlversion_h.set10('WITH_HTML', want_html) xmlversion_h.set10('WITH_HTTP', want_http) -xmlversion_h.set10('WITH_ICONV', want_iconv) -xmlversion_h.set10('WITH_ICU', want_icu) +xmlversion_h.set10('WITH_ICONV', iconv_dep.found()) +xmlversion_h.set10('WITH_ICU', icu_dep.found()) xmlversion_h.set10('WITH_ISO8859X', want_iso8859x) xmlversion_h.set10('WITH_LEGACY', want_legacy) -xmlversion_h.set10('WITH_LZMA', want_lzma) -xmlversion_h.set10('WITH_MODULES', with_modules) +xmlversion_h.set10('WITH_LZMA', lzma_dep.found()) +xmlversion_h.set10('WITH_MODULES', dl_dep.found()) xmlversion_h.set('MODULE_EXTENSION', module_extension) xmlversion_h.set10('WITH_OUTPUT', want_output) xmlversion_h.set10('WITH_PATTERN', want_pattern) @@ -25,7 +25,7 @@ xmlversion_h.set10('WITH_REGEXPS', want_regexps) xmlversion_h.set10('WITH_SAX1', want_sax1) xmlversion_h.set10('WITH_SCHEMAS', want_schemas) xmlversion_h.set10('WITH_SCHEMATRON', want_schematron) -xmlversion_h.set10('WITH_THREADS', want_threads) +xmlversion_h.set10('WITH_THREADS', threads_dep.found()) xmlversion_h.set10('WITH_THREAD_ALLOC', want_thread_alloc) xmlversion_h.set10('WITH_TREE', want_tree) xmlversion_h.set10('WITH_VALID', want_valid) @@ -34,7 +34,7 @@ xmlversion_h.set10('WITH_XINCLUDE', want_xinclude) xmlversion_h.set10('WITH_XPATH', want_xpath) xmlversion_h.set10('WITH_XPTR', want_xptr) xmlversion_h.set10('WITH_XPTR_LOCS', want_xptr_locs) -xmlversion_h.set10('WITH_ZLIB', want_zlib) +xmlversion_h.set10('WITH_ZLIB', zlib_dep.found()) configure_file( input: 'xmlversion.h.in', diff --git a/meson.build b/meson.build index 39831b8a..0542fe9a 100644 --- a/meson.build +++ b/meson.build @@ -60,13 +60,9 @@ want_ftp = get_option('ftp') want_history = get_option('history') want_html = get_option('html') want_http = get_option('http') -want_iconv = get_option('iconv') -want_icu = get_option('icu') want_ipv6 = get_option('ipv6') want_iso8859x = get_option('iso8859x') want_legacy = get_option('legacy') -want_lzma = get_option('lzma') -want_modules = get_option('modules') want_output = get_option('output') want_pattern = get_option('pattern') want_push = get_option('push') @@ -77,7 +73,6 @@ want_regexps = get_option('regexps') want_sax1 = get_option('sax1') want_schemas = get_option('schemas') want_schematron = get_option('schematron') -want_threads = get_option('threads') want_thread_alloc = get_option('thread-alloc') want_tls = get_option('tls') want_tree = get_option('tree') @@ -87,7 +82,6 @@ want_xinclude = get_option('xinclude') want_xpath = get_option('xpath') want_xptr = get_option('xptr') want_xptr_locs = get_option('xptr-locs') -want_zlib = get_option('zlib') # TODO: Options should be three-valued: "yes", "no", default @@ -185,11 +179,8 @@ if get_option('minimum') want_history = false want_html = false want_http = false - want_iconv = false want_ipv6 = false want_iso8859x = false - want_lzma = false - want_modules = false want_output = false want_pattern = false want_push = false @@ -200,7 +191,6 @@ if get_option('minimum') want_sax1 = false want_schemas = false want_schematron = false - want_threads = false want_thread_alloc = false want_tree = false want_valid = false @@ -209,7 +199,6 @@ if get_option('minimum') want_xpath = false want_xptr = false want_xptr_locs = false - want_zlib = false else # Disable dependent modules if want_output == false @@ -402,49 +391,46 @@ if cc.has_function_attribute('destructor') endif ### DSO support -with_modules = false -if want_modules == true - if sys_cygwin == true - module_extension = '.dll' - elif sys_windows == true - module_extension = '.dll' - with_modules = true - else - module_extension = '.so' - endif +if sys_cygwin == true + module_extension = '.dll' +elif sys_windows == true + module_extension = '.dll' +else + module_extension = '.so' +endif - if with_modules == false +dl_dep = dependency('', required: false) +if not get_option('minimum') + if host_machine.system() != 'windows' if meson.version().version_compare('>=0.62') - dl_dep = dependency('dl', required: false) + dl_dep = dependency('dl', required: get_option('modules')) else - dl_dep = cc.find_library('dl', required: false) + dl_dep = cc.find_library('dl', required: get_option('modules')) endif if dl_dep.found() config_h.set10('HAVE_DLOPEN', true) xml_deps += dl_dep - with_modules = true endif + elif get_option('modules').allowed() + dl_dep = declare_dependency() endif endif ### threads -if want_threads == true - if sys_windows == false - threads_dep = dependency('threads') +threads_dep = dependency('', required: false) +if not get_option('minimum') + if host_machine.system() != 'windows' + threads_dep = dependency('threads', required: get_option('threads')) if threads_dep.found() config_h.set10('HAVE_PTHREAD_H', true) xml_deps += threads_dep - else - want_threads = false endif - else - threads_dep = dependency('', required: false) + elif get_option('threads').allowed() + threads_dep = declare_dependency() endif endif -want_thread_alloc = ( - (want_threads == true and want_threads == true) ? true : false -) +want_thread_alloc = threads_dep.found() ### xmllint shell history xmllint_deps = [] @@ -582,51 +568,41 @@ int main() endif ### zlib -if want_zlib == true - zlib_dep = dependency('zlib', required: false) - if zlib_dep.found() - xml_deps += zlib_dep - else - want_zlib = false - endif +if not get_option('minimum') + zlib_dep = dependency('zlib', required: get_option('zlib')) +else + zlib_dep = dependency('', required: false) endif +xml_deps += zlib_dep ### lzma -if want_lzma == true - lzma_dep = dependency('liblzma', required: false) - if lzma_dep.found() - xml_deps += lzma_dep - else - want_lzma = false - endif +if not get_option('minimum') + lzma_dep = dependency('liblzma', required: get_option('lzma')) +else + lzma_dep = dependency('', required: false) endif +xml_deps += lzma_dep ### iconv -if want_iconv == true - iconv_dep = dependency('iconv', required: false) - if iconv_dep.found() - xml_deps += iconv_dep - else - want_iconv = false - endif +if not get_option('minimum') + iconv_dep = dependency('iconv', required: get_option('iconv')) +else + iconv_dep = dependency('', required: false) endif +xml_deps += iconv_dep -if want_iconv == false and want_iso8859x == false +if not iconv_dep.found() and want_iso8859x == false want_iso8859x = false else want_iso8859x = true endif # icu -if want_icu == true - icu_dep = dependency('icu-i18n', method: 'pkg-config', required: false) - if icu_dep.found() - def_var = icu_dep.get_variable(pkgconfig: 'DEFS') - config_dir += include_directories(def_var) - xml_deps += icu_dep - else - want_icu = false - endif +icu_dep = dependency('icu-i18n', method: 'pkg-config', required: get_option('icu')) +if icu_dep.found() + def_var = icu_dep.get_variable(pkgconfig: 'DEFS') + config_dir += include_directories(def_var) + xml_deps += icu_dep endif subdir('include/libxml') @@ -667,8 +643,8 @@ xml_opt_src = [ [want_html, ['HTMLparser.c', 'HTMLtree.c']], [want_http, ['nanohttp.c']], [want_legacy, ['legacy.c']], - [want_lzma, ['xzlib.c']], - [with_modules, ['xmlmodule.c']], + [lzma_dep.found(), ['xzlib.c']], + [dl_dep.found(), ['xmlmodule.c']], [want_output, ['xmlsave.c']], [want_pattern, ['pattern.c']], [want_reader, ['xmlreader.c']], @@ -787,7 +763,7 @@ pkgmod.generate( description: 'libXML library version2.', filebase: 'libxml-2.0', name: 'libXML', - variables: 'modules=' + with_modules.to_string('1', '0'), + variables: 'modules=' + dl_dep.found().to_string('1', '0'), ) ## libxml2-config.cmake file @@ -797,12 +773,12 @@ config_cmake.set('LIBXML_MAJOR_VERSION', v_maj) config_cmake.set('LIBXML_MINOR_VERSION', v_min) config_cmake.set('LIBXML_MICRO_VERSION', v_mic) config_cmake.set('VERSION', meson.project_version()) -config_cmake.set('WITH_ICONV', want_iconv.to_int().to_string()) -config_cmake.set('WITH_ICU', want_icu.to_int().to_string()) -config_cmake.set('WITH_LZMA', want_lzma.to_int().to_string()) -config_cmake.set('WITH_MODULES', want_modules.to_int().to_string()) -config_cmake.set('WITH_THREADS', want_threads.to_int().to_string()) -config_cmake.set('WITH_ZLIB', want_zlib.to_int().to_string()) +config_cmake.set('WITH_ICONV', iconv_dep.found().to_int().to_string()) +config_cmake.set('WITH_ICU', icu_dep.found().to_int().to_string()) +config_cmake.set('WITH_LZMA', lzma_dep.found().to_int().to_string()) +config_cmake.set('WITH_MODULES', dl_dep.found().to_int().to_string()) +config_cmake.set('WITH_THREADS', threads_dep.found().to_int().to_string()) +config_cmake.set('WITH_ZLIB', zlib_dep.found().to_int().to_string()) config_cmake.set('XML_CFLAGS', xml_cflags) configure_file( input: 'libxml2-config.cmake.in', @@ -834,13 +810,13 @@ summary( 'history': want_history, 'html': want_html, 'http': want_http, - 'iconv': want_iconv, - 'icu': want_icu, + 'iconv': iconv_dep.found(), + 'icu': icu_dep.found(), 'ipv6': want_ipv6, 'iso8859x': want_iso8859x, 'legacy': want_legacy, - 'lzma': want_lzma, - 'modules': want_modules, + 'lzma': lzma_dep.found(), + 'modules': dl_dep.found(), 'output': want_output, 'pattern': want_pattern, 'push': want_push, @@ -851,7 +827,7 @@ summary( 'sax1': want_sax1, 'schemas': want_schemas, 'schematron': want_schematron, - 'threads': want_threads, + 'threads': threads_dep.found(), 'thread-alloc': want_thread_alloc, 'tls': want_tls, 'tree': want_tree, @@ -861,7 +837,7 @@ summary( 'xpath': want_xpath, 'xptr': want_xptr, 'xptr-locs': want_xptr_locs, - 'zlib': want_zlib, + 'zlib': zlib_dep.found(), }, section: 'Configuration Options Summary:', ) diff --git a/meson_options.txt b/meson_options.txt index 7b4ba08d..4d61f3d3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -85,14 +85,12 @@ option('http', # TODO meson custom dependency option('iconv', - type: 'boolean', - value: true, + type: 'feature', description: 'iconv support' ) option('icu', - type: 'boolean', - value: false, + type: 'feature', description: 'ICU support' ) @@ -115,14 +113,12 @@ option('legacy', ) option('lzma', - type: 'boolean', - value: false, + type: 'feature', description: 'LZMA support' ) option('modules', - type: 'boolean', - value: true, + type: 'feature', description: 'Dynamic modules support' ) @@ -187,8 +183,7 @@ option('schematron', ) option('threads', - type: 'boolean', - value: true, + type: 'feature', description: 'Multithreading support' ) @@ -247,8 +242,7 @@ option('xptr-locs', ) option('zlib', - type: 'boolean', - value: false, + type: 'feature', description: 'ZLIB support' ) diff --git a/python/meson.build b/python/meson.build index d5a39fd3..633dc922 100644 --- a/python/meson.build +++ b/python/meson.build @@ -20,11 +20,11 @@ if py.found() == true setup_py = configuration_data() setup_py.set('prefix', get_option('prefix')) setup_py.set('LIBXML_VERSION', meson.project_version()) - setup_py.set('WITH_ICONV', want_iconv.to_int()) - setup_py.set('WITH_ICU', want_icu.to_int()) - setup_py.set('WITH_LZMA', want_lzma.to_int()) - setup_py.set('WITH_ZLIB', want_zlib.to_int()) - setup_py.set('WITH_THREADS', want_threads.to_int()) + setup_py.set('WITH_ICONV', iconv_dep.found().to_int()) + setup_py.set('WITH_ICU', icu_dep.found().to_int()) + setup_py.set('WITH_LZMA', lzma_dep.found().to_int()) + setup_py.set('WITH_ZLIB', zlib_dep.found().to_int()) + setup_py.set('WITH_THREADS', threads_dep.found().to_int()) configure_file( input: 'setup.py.in', output: 'setup.py',