From 34084df96a0cbf059a26e0bad686e2a206cc7db7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 21 Feb 2018 19:42:19 +0000 Subject: [PATCH] meson: simplify GST_DISABLE_GST_DEBUG check some more --- meson.build | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 19837218ef..5687663e1f 100644 --- a/meson.build +++ b/meson.build @@ -116,16 +116,12 @@ plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir')) if gst_dep.type_name() == 'internal' gst_debug_disabled = subproject('gstreamer').get_variable('disable_gst_debug') else - # We can't check that in the case of subprojects as we won't + # We can't check that in the case of subprojects as we won't # be able to build against an internal dependency (which is not built yet) - gst_debug_disabled = not cc.compiles('''#include - #ifdef GST_DISABLE_GST_DEBUG - #error "debugging disabled, make compiler fail" - #endif''', dependencies: gst_dep) + gst_debug_disabled = cc.has_header_symbol('gst/gstconfig.h', 'GST_DISABLE_GST_DEBUG', dependencies: gst_dep) endif if gst_debug_disabled and cc.has_argument('-Wno-unused') - message('GStreamer debug system is disabled') add_project_arguments('-Wno-unused', language: 'c') endif -- 2.34.1