[shotwell] Drop enable- prefix from meson options



commit 9c20c463d33bad4f944dc7fe2487bf165d03e7a4
Author: Jens Georg <mail jensge org>
Date:   Sat Mar 17 16:04:18 2018 +0100

    Drop enable- prefix from meson options

 debian/rules        |    2 +-
 meson.build         |    4 ++--
 meson_options.txt   |    6 +++---
 plugins/meson.build |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/debian/rules b/debian/rules
index 535c81e..e11ec58 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@
 override_dh_auto_configure:
        rm -rf debian/build
        mkdir debian/build
-       meson debian/build --prefix=/usr -Denable-unity-support=true -Dinstall-apport-hook=true
+       meson debian/build --prefix=/usr -Dunity-support=true -Dinstall-apport-hook=true
 
 override_dh_auto_compile:
        ninja -C -v debian/build
diff --git a/meson.build b/meson.build
index 5616f38..693cab5 100644
--- a/meson.build
+++ b/meson.build
@@ -57,7 +57,7 @@ libexif = dependency('libexif', version : '>= 0.6.16')
 unity = dependency('unity', required : false)
 
 unity_available = false
-if unity.found() and get_option('enable-unity-support')
+if unity.found() and get_option('unity-support')
   unity_available = true
   add_global_arguments(['--define=UNITY_SUPPORT'], language : 'vala')
 endif
@@ -77,7 +77,7 @@ foreach measure : get_option('measure').split(',')
                        language : 'vala')
 endforeach
 
-if get_option('disable-dupe-detection')
+if not get_option('dupe-detection')
   add_global_arguments(['--define=NO_DUPE_DETECTION'], language : vala)
 endif
 
diff --git a/meson_options.txt b/meson_options.txt
index 0bcab8b..5c6e19c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,7 +1,7 @@
-option('enable-unity-support', type: 'boolean', value : 'false', description: 'Enable Ubuntu Unity support')
+option('unity-support', type: 'boolean', value : 'false', description: 'Enable Ubuntu Unity support')
 option('publishers', type: 'string', value : 'facebook,flickr,picasa,piwigo,youtube,gallery3,tumblr', 
description: 'The list of publishing plugins to build')
-option('enable-extra-plugins', type : 'boolean', value : 'true', description: 'Enable building and 
installation of extra publishing plugins')
+option('extra-plugins', type : 'boolean', value : 'true', description: 'Enable building and installation of 
extra publishing plugins')
 option('trace', type: 'string', value : '', description: 'Enable various trace  options (available: dtors, 
import, md5, metadata-writer, monitoring, pixbuf-cache, reflow, reflow-items)')
 option('measure', type: 'string', value : '', description : 'Enable various timing measurements(available : 
enhance, import, pipeline, view-filtering, thumbnail-cache)')
-option('disable-dupe-detection', type: 'boolean', value : 'false', description: 'Disable duplicate checks')
+option('dupe-detection', type: 'boolean', value : 'true', description: 'Disable duplicate checks')
 option('install-apport-hook', type : 'boolean', value : 'true', description: 'Enable Ubuntu apport hook')
diff --git a/plugins/meson.build b/plugins/meson.build
index 66096c7..9abc0c8 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -18,7 +18,7 @@ sw_plugin_common_dep = declare_dependency(include_directories : include_director
 
 subdir('authenticator')
 subdir('shotwell-publishing')
-if get_option('enable-extra-plugins')
+if get_option('extra-plugins')
   subdir('shotwell-publishing-extras')
 endif
 subdir('shotwell-transitions')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]