Use bind-tools option to ease the server/tools package split --- meson.build.orig 2026-10-09 09:06:40 UTC +++ meson.build @@ -73,6 +73,8 @@ zlib_opt = get_option('zlib').enable_auto_if(developer tracing_opt = get_option('tracing') zlib_opt = get_option('zlib').enable_auto_if(developer_mode) +bind_tools = get_option('bind-tools').enabled() + build_options = meson.build_options() if build_options == '' build_options = 'default' @@ -1381,6 +1383,7 @@ libisccfg_dep = declare_dependency( include_directories: isccfg_inc, ) +if bind_tools executable( 'arpaname', arpaname_src, @@ -1608,7 +1611,9 @@ executable( libisc_dep, ], ) +endif +if not bind_tools executable( 'named-checkconf', named_checkconf_src, @@ -1685,7 +1690,9 @@ executable( lmdb_dep, ], ) +endif +if bind_tools executable( 'named-rrchecker', named_rrchecker_src, @@ -1699,6 +1706,7 @@ executable( ], ) +endif named_deps = [] @@ -1736,6 +1744,7 @@ named_srcconf = named_srcset.apply(config, strict: fal named_srcconf = named_srcset.apply(config, strict: false) +if not bind_tools executable( 'named', named_srcconf.sources(), @@ -1765,7 +1774,9 @@ executable( named_srcconf.dependencies(), ], ) +endif +if bind_tools executable( 'nsec3hash', nsec3hash_src, @@ -1813,7 +1824,9 @@ executable( edit_dep, ], ) +endif +if not bind_tools executable( 'rndc-confgen', rndc_confgen_src, @@ -1924,6 +1937,7 @@ shared_library( libns_dep, ], ) +endif subdir('doc') subdir('tests') @@ -2006,7 +2020,6 @@ print(release_date, end="") print(release_date, end="") ''' -if doc_opt.allowed() release_date = '' if python.found() release_date = run_command(python, ['-c', get_release_date], check: true).stdout() @@ -2027,6 +2040,7 @@ if doc_opt.allowed() install_man(man_pages) +if doc_opt.allowed() if sphinx_build.found() alias_target('doc-misc', doc_misc_targets)