From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Tue, 12 Feb 2019 14:51:28 +0000 (+0100)
Subject: meson: improve keyfile_default
X-Git-Tag: v4.0.0~24^2~137
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c78868c6da0c6941e75eefd80de11e4967ecb378;p=thirdparty%2Fknot-resolver.git

meson: improve keyfile_default
---

diff --git a/meson.build b/meson.build
index 6db05c75f..556b6f27d 100644
--- a/meson.build
+++ b/meson.build
@@ -51,16 +51,15 @@ systemd_tmpfiles_dir = ''
 
 ## Trust anchors
 managed_ta = get_option('managed_ta').enabled()
-keyfile_default = get_option('keyfile_default')
-if keyfile_default == ''
-  keyfile_default = join_paths(etc_dir, 'root.keys')
+keyfile_default = join_paths(etc_dir, get_option('keyfile_default'))
+if keyfile_default == join_paths(etc_dir, 'root.keys')
   install_root_keys = true
   managed_ta = managed_ta or get_option('managed_ta').auto()
 else
   install_root_keys = false
   if managed_ta
-    warning('Using managed_ta along with keyfile_default. Ensure '
-	    + 'keyfile_default directory will be writable by kresd.')
+    warning('Using managed_ta along with non-standard keyfile_default. ' +
+	    'Ensure keyfile_default directory will be writable by kresd.')
   endif
 endif
 
diff --git a/meson_options.txt b/meson_options.txt
index 587d5eb12..76d0fa6e2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -2,7 +2,8 @@
 option(
   'keyfile_default',
   type: 'string',
-  description: 'built-in default path to DNSSEC trust anchors file',
+  value: 'root.keys',
+  description: 'built-in path to DNSSEC trust anchors file',
 )
 
 option(