[gnome-packagekit] Use the shot-form meson configure enable names

[Richard Hughes <rhughes src gnome org>]

commit 181d1dfcf57f3c2c8b0e6cdfc142688176681ddc
Author: Richard Hughes <richard hughsie com>
Date:   Mon Mar 12 12:57:06 2018 +0000

    Use the shot-form meson configure enable names

 meson.build       |    4 ++--
 meson_options.txt |    6 +++---
 src/meson.build   |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/meson.build b/meson.build
index 33e11fe..c2a12aa 100644
--- a/meson.build
+++ b/meson.build
@@ -11,7 +11,7 @@ conf = configuration_data()
 conf.set_quoted('PACKAGE_VERSION', meson.project_version())
 conf.set_quoted('VERSION', meson.project_version())
 
-if get_option('enable-small-form-factor')
+if get_option('small-form-factor')
   conf.set('PK_BUILD_SMALL_FORM_FACTOR', '1')
 endif
 
@@ -88,7 +88,7 @@ gtk = dependency('gtk+-3.0', version : '>= 3.15.3')
 packagekit = dependency('packagekit-glib2', version : '>= 0.9.1')
 libm = cc.find_library('libm', required: false)
 
-if get_option('enable-systemd')
+if get_option('systemd')
   systemd = dependency('libsystemd')
   polkit = dependency('polkit-gobject-1')
 endif
diff --git a/meson_options.txt b/meson_options.txt
index 4306083..334fae2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,3 @@
-option('enable-tests', type : 'boolean', value : true, description : 'enable tests')
-option('enable-small-form-factor', type : 'boolean', value : true, description : 'enable small form factor 
mode')
-option('enable-systemd', type : 'boolean', value : true, description : 'if systemd is used for session 
tracking')
+option('tests', type : 'boolean', value : true, description : 'enable tests')
+option('small-form-factor', type : 'boolean', value : true, description : 'enable small form factor mode')
+option('systemd', type : 'boolean', value : true, description : 'if systemd is used for session tracking')
diff --git a/src/meson.build b/src/meson.build
index c23b897..95fb6d8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -111,7 +111,7 @@ gpk_update_viewer_deps = [
     gtk
 ]
 
-if get_option('enable-systemd')
+if get_option('systemd')
   gpk_update_viewer_srcs += 'systemd-proxy.c'
   gpk_update_viewer_deps += [systemd, polkit]
 endif
@@ -129,7 +129,7 @@ executable(
   install_dir : 'bin'
 )
 
-if get_option('enable-tests')
+if get_option('tests')
   e = executable(
     'gpk-self-test',
     sources : [