Commit 8d18b4c2 authored by Eugene Gorodinsky's avatar Eugene Gorodinsky Committed by Max Kellermann

Fix meson.build to work properly with '-Ddatabase=false'

parent fe862190
...@@ -4,6 +4,7 @@ ver 0.21.8 (not yet released) ...@@ -4,6 +4,7 @@ ver 0.21.8 (not yet released)
- httpd: fix use-after-free bug - httpd: fix use-after-free bug
* fix Bonjour bug * fix Bonjour bug
* fix build failure with GCC 9 * fix build failure with GCC 9
* fix build failure with -Ddatabase=false
* systemd: add user socket unit * systemd: add user socket unit
ver 0.21.7 (2019/04/03) ver 0.21.7 (2019/04/03)
......
...@@ -367,8 +367,10 @@ basic_dep = declare_dependency( ...@@ -367,8 +367,10 @@ basic_dep = declare_dependency(
if enable_database if enable_database
subdir('src/storage') subdir('src/storage')
subdir('src/db') else
storage_glue_dep = dependency('', required: false)
endif endif
subdir('src/db')
if neighbor_glue_dep.found() if neighbor_glue_dep.found()
sources += 'src/command/NeighborCommands.cxx' sources += 'src/command/NeighborCommands.cxx'
......
...@@ -9,6 +9,11 @@ db_api_dep = declare_dependency( ...@@ -9,6 +9,11 @@ db_api_dep = declare_dependency(
link_with: db_api, link_with: db_api,
) )
if not enable_database
db_glue_dep = db_api_dep
subdir_done()
endif
subdir('plugins') subdir('plugins')
db_glue_sources = [ db_glue_sources = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment