From a019f1de381e52671f160ceb4a202f7fa02cef81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Wed, 7 Nov 2018 20:03:14 -0500
Subject: meson: use options name matching GNOME standards

---
 .gitlab-ci.yml      | 2 +-
 libwnck/meson.build | 6 +++---
 meson.build         | 4 ++--
 meson_options.txt   | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58b6d04..8b47048 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,5 +48,5 @@ build:ubuntu:meson:
         python3-setuptools
     - pip3 install meson
   script:
-    - meson _build -Denable-gtk-doc=true
+    - meson _build -Dgtk_doc=true
     - ninja -C _build
diff --git a/libwnck/meson.build b/libwnck/meson.build
index b18727e..8c5c22f 100644
--- a/libwnck/meson.build
+++ b/libwnck/meson.build
@@ -81,7 +81,7 @@ libwnck_ldflags = [
   '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile),
 ]
 
-if get_option('enable-deprecation-flags')
+if get_option('deprecation_flags')
   foreach domain: ['G', 'ATK', 'GDK', 'GDK_PIXBUF', 'GTK', 'WNCK']
     libwnck_cflags += '-D@0@_DISABLE_DEPRECATED'.format(domain)
   endforeach
@@ -123,7 +123,7 @@ progs = [
   'wnckprop',
 ]
 
-if not get_option('enable-deprecation-flags')
+if not get_option('deprecation_flags')
   progs += 'wnck-urgency-monitor'
 endif
 
@@ -141,6 +141,6 @@ foreach prog: progs + test_progs
     include_directories: default_includes,
     dependencies: libwnck_dep,
     link_with: libwnck_lib,
-    install: progs.contains(prog) and get_option('install-tools'),
+    install: progs.contains(prog) and get_option('install_tools'),
     install_dir: bindir)
 endforeach
diff --git a/meson.build b/meson.build
index 45fa8aa..3fc2072 100644
--- a/meson.build
+++ b/meson.build
@@ -43,7 +43,7 @@ pkg_deps = [
   {'name': 'glib-2.0', 'version': '>= 2.32' },
   {'name': 'gobject-2.0', 'version': '>= 2.13.0' },
   {'name': 'gtk+-3.0', 'version': '>= 3.22.0' },
-  {'name': STARTUP_NOTIFICATION_PACKAGE, 'version': '>= 0.4', 'required': get_option('startup-notification').enabled() },
+  {'name': STARTUP_NOTIFICATION_PACKAGE, 'version': '>= 0.4', 'required': get_option('startup_notification').enabled() },
   {'name': X11_PACKAGE },
   {'name': XRES_PACKAGE, 'required': false},
 ]
@@ -93,6 +93,6 @@ endforeach
 subdir('libwnck')
 subdir('po')
 
-if get_option('enable-gtk-doc')
+if get_option('gtk_doc')
   subdir('doc')
 endif
diff --git a/meson_options.txt b/meson_options.txt
index 59eeb7d..f04e7ef 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,12 +1,12 @@
-option('enable-deprecation-flags',
+option('deprecation_flags',
   type: 'boolean',
   value: false,
   description: 'Use *_DISABLE_DEPRECATED flags')
-option('install-tools',
+option('install_tools',
   type: 'boolean',
   value: true,
   description: 'Install wnck-based tools')
-option('startup-notification',
+option('startup_notification',
   type: 'feature',
   value: 'auto',
   description: 'Use Startup notification')
@@ -14,7 +14,7 @@ option('introspection',
   type: 'feature',
   value: 'enabled',
   description: 'Enable GObject introspection')
-option('enable-gtk-doc',
+option('gtk_doc',
   type: 'boolean',
   value: false,
   description: 'Enable generating the API reference (depends on GTK-Doc)')
-- 
cgit v1.2.1