From e915a1aa7f850745bb626bd3342d0f65ee27181b Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 21 Aug 2020 18:51:48 -0400
Subject: [PATCH] Rename the profiler option

We don't support any profilers other than sysprof,
so name the option accordingly. While we are at it,
change it to a meson feature option, so
-Dprofiler=true becomes -Dsysprof=enabled
---
 .gitlab-ci.yml    | 2 +-
 meson.build       | 4 ++--
 meson_options.txt | 8 ++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c03e3cfcd..391c3aacdc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,7 +74,7 @@ fedora-x86_64:
   script:
     - meson subprojects update
     - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
-            -Dprofiler=true
+            -Dsysprof=enabled
             _build
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build x11
diff --git a/meson.build b/meson.build
index bf8d515bbb..7d3f083a9d 100644
--- a/meson.build
+++ b/meson.build
@@ -701,7 +701,7 @@ if cloudproviders_enabled
   endif
 endif
 
-profiler_enabled = get_option('profiler')
+profiler_enabled = get_option('sysprof').enabled()
 if profiler_enabled
   # libsysprof-capture support
   libsysprof_capture_dep = dependency('sysprof-capture-4',
@@ -891,7 +891,7 @@ summary('Print backends', print_backends)
 summary('Media backends', media_backends)
 summary('Vulkan support', have_vulkan)
 summary('Cloud support', get_option('cloudproviders'))
-summary('Profiler', get_option('profiler'))
+summary('Sysprof support', get_option('sysprof').enabled())
 summary('Colord support', get_option('colord'))
 
 # Build
diff --git a/meson_options.txt b/meson_options.txt
index f73f966d60..5eb0a6087e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -23,8 +23,12 @@ option('xinerama', type: 'combo', choices : ['yes', 'no', 'auto'], value : 'auto
   description : 'Enable support for the Xinerama extension')
 option('cloudproviders', type: 'boolean', value: false,
   description : 'Enable the cloudproviders support')
-option('profiler', type: 'boolean', value: false,
-  description : 'Enable profiler support')
+
+option('sysprof',
+       type: 'feature',
+       value: 'disabled',
+       description : 'include tracing support for sysprof')
+
 option('tracker3', type: 'boolean', value: false,
   description : 'Enable Tracker3 filechooser search')