Meson: SQLite3

diff --git a/meson.build b/meson.build
index aec57624b5ff37732fa0715446449a7194055256..e20b7e77c3b5bedc5e6dc5b60d47b3688eaab921 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -77,10 +77,6 @@ if not opt_unittests
   summary('Test', dep_boost_test.found(), bool_yn: true, section: 'Boost')
 endif
 
-# Sqlite3
-opt_sqlite3 = get_option('sqlite3')
-# TODO Use Sqlite3
-
 # Swagger
 if not fs.exists('pdns/api-swagger.json') and not python_have_venv
   error('Python3 and/or its venv module is not available and ' +

diff --git a/meson/sqlite3/meson.build b/meson/sqlite3/meson.build
new file mode 100644 (file)
index 0000000..49cb598
--- /dev/null
+++ b/meson/sqlite3/meson.build
@@ -0,0 +1,9 @@
+# SQLite3
+# Outputs: deps_sqlite3
+
+deps_sqlite3 = dependency('sqlite3', required: true)
+
+conf.set10('HAVE_SQLITE3', deps_sqlite3.found(), description: 'Whether we have Sqlite3')
+conf.set10('SQLITE3', deps_sqlite3.found(), description: 'Whether we have Sqlite3')
+summary('SQLite3', deps_sqlite3.found(), bool_yn: true, section: 'Configuration')
+summary('SQLite3 Version', deps_sqlite3.version(), section: 'Configuration')

diff --git a/meson_options.txt b/meson_options.txt
index 06dc83c46fa554123137ece06a68bfb5c09068e3..0fc09e26c9e4aa1ce1d272f70fa0098334065ddc 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -13,7 +13,6 @@ option('unit-tests', type: 'boolean', value: false, description: 'Enable buildin
 option('backend-unit-tests', type: 'boolean', value: false, description: 'Enable building backend unit tests')
 option('reproducible', type: 'boolean', value: false, description: 'Create reproducible builds. Use this only if you are a distribution maintainer and need reproducible builds. If you compile PowerDNS yourself, leave this disabled, as it might make debugging harder')
 option('fuzz-targets', type: 'boolean', value: false, description: 'Enable fuzzing targets')
-option('sqlite3', type: 'boolean', value: false, description: 'Include the sqlite3 driver')
 option('verbose-logging', type: 'boolean', value: false, description: 'Enable verbose logging')
 option('pkcs11', type: 'boolean', value: false, description: 'Enable PKCS11 support (experimental)')
 option('gss-tsig', type: 'boolean', value: false, description: 'Enable GSS-TSIG support (experimental)')
@@ -24,3 +23,5 @@ option('module-godbc', type: 'boolean', value: false, description: 'Build the go
 option('module-godbc-dyn', type: 'boolean', value: false, description: 'Build the dynamically loadable godbc backend')
 option('module-gpgsql', type: 'boolean', value: false, description: 'Build the gpgsql backend')
 option('module-gpgsql-dyn', type: 'boolean', value: false, description: 'Build the dynamically loadable gpgsql backend')
+option('module-gsqlite3', type: 'boolean', value: false, description: 'Build the gsqlite3 backend')
+option('module-gsqlite3-dyn', type: 'boolean', value: false, description: 'Build the dynamically loadable gsqlite3 backend')