[libgda] Options: renamed disable-sqlcipher to sqlcipher
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Options: renamed disable-sqlcipher to sqlcipher
- Date: Sun, 31 Jan 2021 22:43:05 +0000 (UTC)
commit 15bc3cb7995c4a0203d6f64257d9f9116a290c0f
Author: Daniel Espinosa <esodan gmail com>
Date: Sun Jan 31 15:07:29 2021 -0600
Options: renamed disable-sqlcipher to sqlcipher
meson.build | 2 +-
meson_options.txt | 2 +-
providers/meson.build | 2 +-
tests/providers/meson.build | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index e62ab1f68..f45197cf6 100644
--- a/meson.build
+++ b/meson.build
@@ -120,7 +120,7 @@ if sqlite_dep.found()
endif
sqlcipher_dep = dependency ('sqlcipher', version: '>= 3.4', required: false)
-if sqlcipher_dep.found() and not get_option('disable-sqlcipher')
+if sqlcipher_dep.found() and not get_option('sqlcipher')
sqlcipher_table_column_metadata = compiler.has_function('sqlite3_table_column_metadata',
dependencies: sqlcipher_dep)
endif
diff --git a/meson_options.txt b/meson_options.txt
index 857962cf4..a0e8bcff3 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,7 +4,7 @@ option('help', type : 'boolean', value : true, description : 'Enable building he
#option('goocanvas', type : 'boolean', value : false, description : 'Enable using GooCanvas')
option('graphviz', type : 'boolean', value : false, description : 'Enable using Graphviz')
option('json', type : 'boolean', value : true, description : 'Enable support for JSON, disabled by default')
-option('disable-sqlcipher', type : 'boolean', value : false, description : 'Disable SQLCipher database
provider')
+option('sqlcipher', type : 'boolean', value : true, description : 'Build SQLCipher database provider')
option('with-libsoup', type : 'boolean', value : true, description : 'Enable libsoup support')
option('with-libsecret', type : 'boolean', value : false, description : 'Enable libsecret support')
option('with-gnome-keyring', type : 'boolean', value : false, description : 'Enable gnome-keyring support')
diff --git a/providers/meson.build b/providers/meson.build
index f4ce1c41c..53d61febe 100644
--- a/providers/meson.build
+++ b/providers/meson.build
@@ -4,7 +4,7 @@ subdir('reuseable')
subdir('sqlite')
subdir('skel-implementation')
-if sqlcipher_dep.found() and not get_option('disable-sqlcipher')
+if sqlcipher_dep.found() and get_option('sqlcipher')
subdir('sqlcipher')
endif
diff --git a/tests/providers/meson.build b/tests/providers/meson.build
index 312409eab..4d675575d 100644
--- a/tests/providers/meson.build
+++ b/tests/providers/meson.build
@@ -29,7 +29,7 @@ test('ProviderSQLite', tchksqlite,
]
)
-if sqlcipher_dep.found () and not get_option('disable-sqlcipher')
+if sqlcipher_dep.found () and get_option('sqlcipher')
tchksqlcipher = executable('check_sqlcipher',
['check_sqlcipher.c']+providers_common_sources+common_sources+tests_sources,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]