]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Merge branch 'sysrepo' of gitlab.nic.cz:knot/knot-resolver into sysrepo
authorAleš <ales.mrazek@nic.cz>
Mon, 20 Jul 2020 15:05:26 +0000 (17:05 +0200)
committerAleš <ales.mrazek@nic.cz>
Mon, 20 Jul 2020 15:05:26 +0000 (17:05 +0200)
1  2 
meson.build
utils/cache_gc/main.c

diff --cc meson.build
index c4b6cf46cb5e33fb3b2083d5b768453a51ff94a6,099160480e24776c02335d724c11d0ac2c3d768c..2b710c9bc61e51da13d240f4bbd585e409aa2b15
@@@ -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)
index e6c98a5ff6bee733719b3f14c6ccbee943a92ca5,d5241b6e0b8538c7654a0dd83f0658b3404ca0f1..4e8795614c266d63e08782d7ac18147443c967d5
@@@ -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;