Make libcap mandatory on Linux again

When refactoring the BIND 9.21 build system to meson, libcap was
unintentionally made optional on Linux.

diff --git a/meson.build b/meson.build
index 619d1347b6dde4027a90f6f08de91cf06e14ba8a..f99d65f2c6892a1032cbd1449d1d2b0c7d9ac5b4 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -50,7 +50,6 @@ meson_lto = get_option('b_lto')
 trace_logging = get_option('trace-logging')
 rcu_flavor = get_option('rcu-flavor')
 
-cap_opt = get_option('cap')
 cmocka_opt = get_option('cmocka')
 dnstap_opt = get_option('dnstap')
 doc_opt = get_option('doc')
@@ -818,11 +817,9 @@ endif
 
 ## libcap
 cap_dep = null_dep
-if cap_opt.allowed()
-    cap_dep = dependency('libcap', required: cap_opt)
-    if cap_dep.found()
-        config.set('HAVE_LIBCAP', 1)
-    endif
+cap_dep = dependency('libcap', required: host_machine.system() == 'linux')
+if cap_dep.found()
+    config.set('HAVE_LIBCAP', 1)
 endif
 
 ## IDN

diff --git a/meson_options.txt b/meson_options.txt
index 2f1ae16a1ca9e862a10fe47341341b603528786d..70a77f312866673466c774bcbf5470e3d4205fe1 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -17,13 +17,6 @@ option(
     description: 'Enable sphinx-based documentation generation',
 )
 
-option(
-    'cap',
-    type: 'feature',
-    value: 'auto',
-    description: 'Enable libcap-based capability support',
-)
-
 option(
     'dnstap',
     type: 'feature',