Merge branch 'v0.21.x'

2019-04-18 11:48:22 +02:00
parent d28307e082 ead3dc6a92
commit ccc58f2a32
12 changed files with 60 additions and 25 deletions
--- a/meson.build
+++ b/meson.build
@@ -377,8 +377,10 @@ basic_dep = declare_dependency(

 if enable_database
  subdir('src/storage')
-  subdir('src/db')
+else
+  storage_glue_dep = dependency('', required: false)
 endif
+subdir('src/db')

 if neighbor_glue_dep.found()
  sources += 'src/command/NeighborCommands.cxx'