Merge branch 'v0.21.x'

2019-11-04 15:07:46 +01:00
parent 3f4437266b d659c7df19
commit 496f43e25d
8 changed files with 26 additions and 12 deletions
--- a/src/neighbor/meson.build
+++ b/src/neighbor/meson.build
@@ -1,4 +1,4 @@
-if not get_option('neighbor')
+if not get_option('neighbor') or not enable_database
  conf.set('ENABLE_NEIGHBOR_PLUGINS', false)
  neighbor_glue_dep = dependency('', required: false)
  subdir_done()