From: Aleš <ales.mrazek@nic.cz>
Date: Mon, 20 Jul 2020 15:05:26 +0000 (+0200)
Subject: Merge branch 'sysrepo' of gitlab.nic.cz:knot/knot-resolver into sysrepo
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af56df9cc1d2ad8b64083f551bf8475ad5bd863c;p=thirdparty%2Fknot-resolver.git

Merge branch 'sysrepo' of gitlab.nic.cz:knot/knot-resolver into sysrepo
---

af56df9cc1d2ad8b64083f551bf8475ad5bd863c
diff --cc meson.build
index c4b6cf46c,099160480..2b710c9bc
--- a/meson.build
+++ b/meson.build
@@@ -108,10 -98,14 +108,26 @@@ els
  endif
  
  ### Systemd
 -libsystemd = dependency('libsystemd', required: false)
  systemd_files = get_option('systemd_files')
 -if systemd_files == 'enabled' and (
 -    not libsystemd.found() or libsystemd.version().version_compare('<227'))
 -  error('systemd_files=enabled requires libsystemd >= 227')
 +libsystemd = dependency('libsystemd', required: systemd_files == 'enabled')
 +message('---------------------------')
 +
++### Sysrepo
++message('--- sysrepo dependencies ---')
++libsysrepo = dependency('sysrepo', version: '>=1.4.2', required: false)
++libyang = dependency('libyang', version: '>=1.0.130', required: false)
++sysrepo = get_option('sysrepo')
++if (sysrepo == 'auto' or sysrepo == 'enabled') and libsysrepo.found() and libyang.found()
++  build_sysrepo = true
++elif sysrepo == 'enabled' and not libyang.found()
++  error('sysrepo=enabled requires libyang >= 1.0.130')
++elif sysrepo == 'enabled' and not libsysrepo.found()
++  error('sysrepo=enabled requires sysrepo >= 1.4.2')
++else
++  build_sysrepo = false
+ endif
+ message('---------------------------')
+ 
  ### Sysrepo
  message('--- sysrepo dependencies ---')
  libsysrepo = dependency('sysrepo', version: '>=1.4.2', required: false)
diff --cc utils/cache_gc/main.c
index e6c98a5ff,d5241b6e0..4e8795614
--- a/utils/cache_gc/main.c
+++ b/utils/cache_gc/main.c
@@@ -248,8 -242,6 +248,9 @@@ int main(int argc, char *argv[]
  		return 1;
  	}
  
 +	int exit_code = 0;
 +	kr_cache_gc_state_t *gc_state = NULL;
++
  	#ifdef ENABLE_SYSREPO
  	int fd;
  	int rv = SR_ERR_OK;