Meson: Change extra-checks to feature option and make it yielding

diff --git a/meson.build b/meson.build
index 03926552cd45fc8404ecb10bb22336f21f29bd57..60d844fe2a294a58c7d1e960365f3ba8d6748828 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -436,7 +436,7 @@ test_deps = [gmp_dep, gsl_dep, gslcblas_dep]
 # Used by gstinfo.c
 dl_dep = cc.find_library('dl', required : false)
 cdata.set('HAVE_DLADDR', cc.has_function('dladdr', dependencies : dl_dep))
-cdata.set('GST_ENABLE_EXTRA_CHECKS', get_option('extra-checks'))
+cdata.set('GST_ENABLE_EXTRA_CHECKS', not get_option('extra-checks').disabled())
 cdata.set('USE_POISONING', get_option('poisoning'))
 
 configinc = include_directories('.')

diff --git a/meson_options.txt b/meson_options.txt
index cc7fc0e034aa5d9bc2a67aab8b1f464029c73660..72c3997e2993070f7f424acd93c9e8acec89e7ed 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,7 +9,6 @@ option('ptp-helper-setuid-group', type : 'string',
        description : 'Group to switch to when installing gst-ptp-helper setuid root')
 option('ptp-helper-permissions', type : 'combo',
        choices : ['none', 'setuid-root', 'capabilities', 'auto'], value : 'auto')
-option('extra-checks', type : 'boolean', value : true, description : 'Enable extra runtime checks')
 option('option-parsing', type : 'boolean', value : true,
        description: 'Enable command line option parsing')
 option('poisoning', type : 'boolean', value : false, description : 'Enable poisoning of deallocated objects')
@@ -39,6 +38,7 @@ option('glib-asserts', type : 'feature', value : 'enabled', yield : true,
        description: 'Enable GLib assertion (auto = enabled for development, disabled for stable releases)')
 option('glib-checks', type : 'feature', value : 'enabled', yield : true,
        description: 'Enable GLib checks such as API guards (auto = enabled for development, disabled for stable releases)')
+option('extra-checks', type : 'feature', value : 'enabled', yield : true, description : 'Enable extra runtime checks')
 
 # Common options
 option('package-name', type : 'string', yield : true,