From 03a4c0100a8ce865dcc889d2232ee7a79f16f1bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?= <89q1r14hd@relay.firefox.com> Date: Mon, 9 Aug 2021 13:27:12 +0300 Subject: [PATCH] pipewire-jack/src/meson.build: turn jack-devel warning into error Almost no one will see that warning just like the rest of Meson configuration warnings. So, if it's gonna yield a build with dysfunctional JACK SDK, then it's best to make it explicitly fail before people file bugs about missing jack.pc file. --- pipewire-jack/src/meson.build | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pipewire-jack/src/meson.build b/pipewire-jack/src/meson.build index 6d0b49bc0..cdc147ba4 100644 --- a/pipewire-jack/src/meson.build +++ b/pipewire-jack/src/meson.build @@ -68,23 +68,24 @@ pipewire_jackserver = shared_library('jacknet', install_dir : libjack_path, ) -if meson.version().version_compare('>=0.59.0') - if get_option('jack-devel') == true - pkgconfig.generate(filebase : 'jack', - libraries : [pipewire_jack, pipewire_jackserver], - name : 'jack', - description : 'PipeWire JACK API', - version : '1.9.17', - extra_cflags : '-D_REENTRANT', - unescaped_variables: ['server_libs=-L${libdir} -ljackserver']) - endif -else - warning( + +if get_option('jack-devel') == true + if meson.version().version_compare('<0.59.0') + error( ''' - No jack pkg-config file is generated.\n - Before version 0.59.0 Meson creates a wrong jack pkg-config file.\n - Please update Meson if you want to generate a jack pkg-config file. + Before version 0.59.0 Meson creates a wrong jack pkg-config file. + For that reason this is now an error. Please update Meson, + if you want to have JACK development files. ''') + endif + + pkgconfig.generate(filebase : 'jack', + libraries : [pipewire_jack, pipewire_jackserver], + name : 'jack', + description : 'PipeWire JACK API', + version : '1.9.17', + extra_cflags : '-D_REENTRANT', + unescaped_variables: ['server_libs=-L${libdir} -ljackserver']) endif if sdl_dep.found()