From 129d8e89b9189d88e4da970ed642f4b9ca731574 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 4 Nov 2019 14:10:03 +0100 Subject: [PATCH] lib/sqlite: disable if -Ddatabase=false Fixes build failure in StickerCommands.cxx. --- NEWS | 1 + src/lib/sqlite/meson.build | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index deaf78cac..6bb77ecf4 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ ver 0.21.17 (not yet released) * outputs - jack: mark ports as terminal +* fix build failure with -Ddatabase=false ver 0.21.16 (2019/10/16) * queue diff --git a/src/lib/sqlite/meson.build b/src/lib/sqlite/meson.build index dcaf9e267..8f1fccbfb 100644 --- a/src/lib/sqlite/meson.build +++ b/src/lib/sqlite/meson.build @@ -1,4 +1,9 @@ -sqlite_dep = dependency('sqlite3', version: '>= 3.7.3', required: get_option('sqlite')) +if enable_database + sqlite_dep = dependency('sqlite3', version: '>= 3.7.3', required: get_option('sqlite')) +else + sqlite_dep = dependency('', required: false) +endif + conf.set('ENABLE_SQLITE', sqlite_dep.found()) if not sqlite_dep.found() subdir_done()