From: Aleš <ales.mrazek@nic.cz>
Date: Wed, 15 Jan 2020 15:42:48 +0000 (+0100)
Subject: sysrepo: meson corrections
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17690862315065aff0acc85b10e753b4ee0cb1af;p=thirdparty%2Fknot-resolver.git

sysrepo: meson corrections
---

diff --git a/meson.build b/meson.build
index 79d943d14..948880ee1 100644
--- a/meson.build
+++ b/meson.build
@@ -118,11 +118,11 @@ libsysrepo = dependency('sysrepo', version: '>=1', required: false)
 libyang = dependency('libyang', version: '>=1', required: false)
 sysrepo = get_option('sysrepo')
 if (sysrepo == 'auto' or sysrepo == 'enabled') and libsysrepo.found() and libyang.found()
-  enable_sysrepo = true
-elif sysrepo == 'enabled' and not libsysrepo.found() and not libyang.found()
+  build_sysrepo = true
+elif sysrepo == 'enabled' and (not libsysrepo.found() or not libyang.found())
   error('sysrepo=enabled requires libsysrepo and libyang')
 else
-  enable_sysrepo = false
+  build_sysrepo = false
 endif
 message('---------------------------')
 
@@ -184,7 +184,7 @@ conf_data.set('SYSTEMD_VERSION',
 conf_data.set('NOVERBOSELOG', not verbose_log)
 conf_data.set('ENABLE_SENDMMSG', sendmmsg.to_int())
 conf_data.set('ENABLE_CAP_NG', capng.found())
-conf_data.set('ENABLE_SYSREPO', enable_sysrepo)
+conf_data.set('ENABLE_SYSREPO', build_sysrepo)
 
 kresconfig = configure_file(
   output: 'kresconfig.h',
@@ -291,7 +291,7 @@ run_target(
 s_managed_ta = managed_ta ? 'enabled' : 'disabled'
 s_install_root_keys = install_root_keys ? 'enabled' : 'disabled'
 s_systemd_socket = libsystemd.found() ? 'enabled' : 'disabled'
-s_enable_sysrepo = enable_sysrepo ? 'enabled' : 'disabled'
+s_build_sysrepo = build_sysrepo ? 'enabled' : 'disabled'
 s_build_client = build_client ? 'enabled' : 'disabled'
 s_build_utils = build_utils ? 'enabled' : 'disabled'
 s_build_dnstap = build_dnstap ? 'enabled' : 'disabled'
@@ -324,7 +324,7 @@ message('''
     cache_dir:          @0@'''.format(systemd_cache_dir) + '''
 
   optional components
-    sysrepo:            @0@'''.format(s_enable_sysrepo) + '''
+    sysrepo:            @0@'''.format(s_build_sysrepo) + '''
     client:             @0@'''.format(s_build_client) + '''
     utils:              @0@'''.format(s_build_utils) + '''
     dnstap:             @0@'''.format(s_build_dnstap) + '''
diff --git a/modules/sysrepo-lua/meson.build b/modules/sysrepo-lua/meson.build
index 5da9ea8ab..bbe88c483 100644
--- a/modules/sysrepo-lua/meson.build
+++ b/modules/sysrepo-lua/meson.build
@@ -3,6 +3,6 @@
 sysrepo_lua_src = files([
 ])
 
-if enable_sysrepo
+if build_sysrepo
 
 endif
diff --git a/modules/sysrepo/meson.build b/modules/sysrepo/meson.build
index b5ecf1cab..87b9ac3e0 100644
--- a/modules/sysrepo/meson.build
+++ b/modules/sysrepo/meson.build
@@ -11,7 +11,7 @@ sysrepo_common_src = files([
 ])
 c_src_lint += sysrepo_common_src
 
-if enable_sysrepo
+if build_sysrepo
     sysrepo_mod = shared_module(
 	'sysrepo',
 	sysrepo_src,
diff --git a/utils/kres_watcher/meson.build b/utils/kres_watcher/meson.build
index 8a1e1843e..a8fa67d4d 100644
--- a/utils/kres_watcher/meson.build
+++ b/utils/kres_watcher/meson.build
@@ -3,7 +3,7 @@ kres_watcher_src = files([
 ])
 c_src_lint += kres_watcher_src
 
-if enable_sysrepo
+if build_sysrepo
     kres_watcher = executable(
     'kres-watcher',
     kres_watcher_src,
diff --git a/utils/kresc/main.c b/utils/kresctl/main.c
similarity index 100%
rename from utils/kresc/main.c
rename to utils/kresctl/main.c
diff --git a/utils/kresc/meson.build b/utils/kresctl/meson.build
similarity index 73%
rename from utils/kresc/meson.build
rename to utils/kresctl/meson.build
index 88473a59b..583548df5 100644
--- a/utils/kresc/meson.build
+++ b/utils/kresctl/meson.build
@@ -1,12 +1,12 @@
-kresc_src = files([
+kresctl_src = files([
     'main.c',
 ])
-c_src_lint += kresc_src
+c_src_lint += kresctl_src
 
-if enable_sysrepo
+if build_sysrepo
     kresc = executable(
-    'kresc',
-    kresc_src,
+    'kresctl',
+    kresctl_src,
     sysrepo_common_src,
     dependencies: [
       contrib_dep,
diff --git a/utils/meson.build b/utils/meson.build
index 96dffb0ab..24c0e72d9 100644
--- a/utils/meson.build
+++ b/utils/meson.build
@@ -3,7 +3,7 @@
 
 build_utils = get_option('utils') != 'disabled'
 
-subdir('kresc')
+subdir('kresctl')
 subdir('kres_watcher')
 subdir('client')
 subdir('cache_gc')