[gnome-builder: 12/139] build: update options for tracing/profiling

[Christian Hergert <chergert src gnome org>]

commit 0454abd0a5e4f4b081787fe1abdc3209d061e864
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jan 9 15:03:58 2019 -0800

    build: update options for tracing/profiling

 build-aux/flatpak/org.gnome.Builder.json | 2 +-
 meson.build                              | 6 +++---
 meson_options.txt                        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 5d5e887a2..22fefbe40 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -520,7 +520,7 @@
                 "-Dfusermount_wrapper=true",
                 "-Dtcmalloc=true",
                 "-Dpython_libprefix=python3.7",
-                "-Denable_tracing=true",
+                "-Dtracing=true",
                 "-Dhelp=true",
                 "-Dwith_channel=flatpak-nightly",
                 "-Dwith_deviced=true"
diff --git a/meson.build b/meson.build
index d17390baf..d285122f1 100644
--- a/meson.build
+++ b/meson.build
@@ -66,8 +66,8 @@ status += [
   'Libdir ................ : @0@'.format(join_paths(get_option('prefix'), get_option('libdir'))),
   'Safe PATH ............. : @0@'.format(safe_path),
   '',
-  'Tracing ............... : @0@'.format(get_option('enable_tracing')),
-  'Profiling ............. : @0@'.format(get_option('enable_profiling')),
+  'Tracing ............... : @0@'.format(get_option('tracing')),
+  'Profiling ............. : @0@'.format(get_option('profiling')),
   'fusermount ............ : @0@'.format(get_option('fusermount_wrapper')),
   'tcmalloc_minimal ...... : @0@'.format(get_option('tcmalloc')),
   '',
@@ -170,7 +170,7 @@ test_c_args = [
 if get_option('buildtype') != 'plain'
   test_c_args += '-fstack-protector-strong'
 endif
-if get_option('enable_profiling')
+if get_option('profiling')
   test_c_args += '-pg'
 endif
 
diff --git a/meson_options.txt b/meson_options.txt
index f0150ca88..0db9d5cec 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,5 @@
-option('enable_tracing', type: 'boolean', value: false, description: 'Enable tracing of internals for 
troubleshooting Builder')
-option('enable_profiling', type: 'boolean', value: false, description: 'Enable profiling of the Builder 
codebase')
+option('tracing', type: 'boolean', value: false, description: 'Enable tracing of internals for 
troubleshooting Builder')
+option('profiling', type: 'boolean', value: false, description: 'Enable profiling of the Builder codebase')
 option('fusermount_wrapper', type: 'boolean', value: false, description: 'Install fusermount-wrapper when 
distributing with flatpak')
 option('tcmalloc', type: 'boolean', value: false, description: 'Use tcmalloc for dynamic allocations')