[shotwell] build: Consistent meson_options.txt

[Jens Georg <jensgeorg src gnome org>]

commit 1a85ffc42e23641e6e6b7e236d5d186dfba356ae
Author: Jens Georg <mail jensge org>
Date:   Tue Jun 30 12:30:27 2020 +0200

    build: Consistent meson_options.txt
    
    Use "_" everywhere and let meson do the dirty work of ignoring optional
    dependencies

 data/meson.build                |  2 +-
 flatpak/org.gnome.Shotwell.json |  4 ++--
 meson.build                     | 10 ++++------
 meson_options.txt               | 12 ++++++------
 plugins/meson.build             |  2 +-
 src/meson.build                 |  8 ++------
 6 files changed, 16 insertions(+), 22 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index fd808e98..9c17f0ff 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,4 +1,4 @@
-if get_option('install-apport-hook')
+if get_option('install_apport_hook')
     subdir('apport')
 endif
 
diff --git a/flatpak/org.gnome.Shotwell.json b/flatpak/org.gnome.Shotwell.json
index 418c27db..6299e2c4 100644
--- a/flatpak/org.gnome.Shotwell.json
+++ b/flatpak/org.gnome.Shotwell.json
@@ -223,8 +223,8 @@
             "buildsystem" : "meson",
             "config-opts" : [
                 "-Dudev=false",
-                "-Dinstall-apport-hook=false",
-                "-Dface-detection=true",
+                "-Dinstall_apport_hook=false",
+                "-Dface_detection=true",
                 "-Dface_detection_helper_bus=private"
             ],
             "sources" : [
diff --git a/meson.build b/meson.build
index 145fcda9..cdc2f5b5 100644
--- a/meson.build
+++ b/meson.build
@@ -72,9 +72,7 @@ clutter_gtk = dependency('clutter-gtk-1.0')
 webpdemux = dependency('libwebpdemux')
 webp = dependency('libwebp')
 
-unity_available = false
-if unity.found() and get_option('unity-support')
-  unity_available = true
+if unity.found() and get_option('unity_support')
   add_global_arguments(['--define=UNITY_SUPPORT'], language : 'vala')
 endif
 
@@ -93,7 +91,7 @@ foreach measure : get_option('measure')
                        language : 'vala')
 endforeach
 
-if not get_option('dupe-detection')
+if not get_option('dupe_detection')
   add_global_arguments(['--define=NO_DUPE_DETECTION'], language : 'vala')
 endif
 
@@ -101,14 +99,14 @@ if get_option('udev') and gudev.found()
   add_global_arguments(['--define=HAVE_UDEV'], language : 'vala')
 endif
 
-if get_option('face-detection')
+if get_option('face_detection')
   add_global_arguments(['--define=ENABLE_FACES'], language : 'vala')
 
   if get_option('face_detection_helper_bus') == 'private'
       add_global_arguments(['--define=FACEDETECT_BUS_PRIVATE'], language : 'vala')
   endif
 
-  if get_option('face-detection-helper')
+  if get_option('face_detection_helper')
       subproject('shotwell-facedetect')
   endif
 endif
diff --git a/meson_options.txt b/meson_options.txt
index 0338d469..e960ebd2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,12 +1,12 @@
-option('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: 'array', choices: 
['flickr','googlephotos','piwigo','youtube','gallery3','tumblr'], value : 
['flickr','googlephotos','piwigo','youtube','gallery3','tumblr'], description: 'The list of publishing 
plugins to build')
-option('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: 'array', choices: ['dtors', 'import', 'md5', 'metadata-writer', 'monitoring', 
'pixbuf-cache', 'reflow', 'reflow-items'], value : [], description: 'Enable various trace options')
 option('measure', type: 'array', choices: ['enhance', 'import', 'pipeline', 'view-filtering', 
'thumbnail-cache'], value : [], description : 'Enable various timing measurements')
-option('dupe-detection', type: 'boolean', value : 'true', description: 'Disable duplicate checks')
+option('dupe_detection', type: 'boolean', value : 'true', description: 'Disable duplicate checks')
 option('udev', type: 'boolean', value : 'true', description: 'Enable or disable udev support')
-option('install-apport-hook', type : 'boolean', value : 'true', description: 'Enable Ubuntu apport hook')
-option('face-detection', type:'boolean', value:false, description: 'Enable face detection and recognition 
features')
-option('face-detection-helper', type : 'boolean', value : 'true', description : 'If face-detection is 
enabled, build the external helper tool')
+option('install_apport_hook', type : 'boolean', value : 'true', description: 'Enable Ubuntu apport hook')
+option('face_detection', type:'boolean', value:false, description: 'Enable face detection and recognition 
features')
+option('face_detection_helper', type : 'boolean', value : 'true', description : 'If face-detection is 
enabled, build the external helper tool')
 option('face_detection_helper_bus', type:'combo', choices: ['private', 'session'], value : 'session', 
description: 'Which DBus bus to use for external helper tool')
 option('fatal_warnings', type:'boolean', value:false)
diff --git a/plugins/meson.build b/plugins/meson.build
index 9abc0c8f..c1a1962e 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('extra-plugins')
+if get_option('extra_plugins')
   subdir('shotwell-publishing-extras')
 endif
 subdir('shotwell-transitions')
diff --git a/src/meson.build b/src/meson.build
index b9729445..304d095c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -26,7 +26,7 @@ shotwell_libs = [sw_graphics_processor]
 face_sources = []
 face_obj = ''
 
-if get_option('face-detection')
+if get_option('face_detection')
   face_sources = (['faces/FacesBranch.vala',
                      'faces/FacePage.vala',
                      'faces/FaceShape.vala',
@@ -36,14 +36,10 @@ if get_option('face-detection')
 endif
 
 shotwell_deps = [gio, gee, sqlite, gtk, sqlite, posix, gphoto2,
-                 gstreamer_pbu, gio_unix, gudev, gexiv2, gmodule,
+                 gstreamer_pbu, gio_unix, gudev, gexiv2, gmodule, unity,
                  libraw, libexif, sw_plugin, webpdemux, webp, version,
                  clutter, clutter_gtk, champlain, champlain_gtk]
 
-if unity_available
-    shotwell_deps += [unity]
-endif
-
 subdir('publishing')
 
 executable('shotwell',