From b901ac50eedaac933304b92889f6ff92592efc84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Wed, 14 Dec 2022 09:43:14 +0100 Subject: [PATCH] =?UTF-8?q?meson:=20make=20=E2=80=98network=E2=80=99=20plu?= =?UTF-8?q?gin=20compile=20time=20optional?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meson.build | 2 ++ meson_options.txt | 2 ++ modules/meson.build | 6 +++++- plugin.c | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 4a5c4d5..0089fa7 100644 --- a/meson.build +++ b/meson.build @@ -143,6 +143,7 @@ yambar = executable( plugin_mpd_enabled ? '-DPLUGIN_ENABLED_MPD' : [], plugin_i3_enabled ? '-DPLUGIN_ENABLED_I3' : [], plugin_label_enabled ? '-DPLUGIN_ENABLED_LABEL' : [], + plugin_network_enabled ? '-DPLUGIN_ENABLED_NETWORK' : [], plugin_pipewire_enabled ? '-DPLUGIN_ENABLED_PIPEWIRE' : [], plugin_pulse_enabled ? '-DPLUGIN_ENABLED_PULSE' : [], ], @@ -194,6 +195,7 @@ summary( 'Music Player Daemon (MPD)': plugin_mpd_enabled, 'i3+Sway': plugin_i3_enabled, 'Label': plugin_label_enabled, + 'Network monitoring': plugin_network_enabled, 'Pipewire': plugin_pipewire_enabled, 'PulseAudio': plugin_pulse_enabled, }, diff --git a/meson_options.txt b/meson_options.txt index c206f92..d64f85b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -28,6 +28,8 @@ option('plugin-i3', type: 'feature', value: 'auto', description: 'i3+Sway support') option('plugin-label', type: 'feature', value: 'auto', description: 'Label support') +option('plugin-network', type: 'feature', value: 'auto', + description: 'Network monitoring support') option('plugin-pipewire', type: 'feature', value: 'auto', description: 'Pipewire support') option('plugin-pulse', type: 'feature', value: 'auto', diff --git a/modules/meson.build b/modules/meson.build index 6059970..ba5647e 100644 --- a/modules/meson.build +++ b/modules/meson.build @@ -28,6 +28,7 @@ json_i3 = dependency('json-c', required: get_option('plugin-i3')) plugin_i3_enabled = json_i3.found() plugin_label_enabled = get_option('plugin-label').allowed() +plugin_network_enabled = get_option('plugin-network').allowed() pipewire = dependency('libpipewire-0.3', required: get_option('plugin-pipewire')) plugin_pipewire_enabled = pipewire.found() @@ -39,7 +40,6 @@ plugin_dwl_enabled = get_option('plugin-dwl').allowed() # Module name -> (source-list, dep-list) mod_data = { - 'network': [[], []], 'removables': [[], [dynlist, udev]], 'script': [[], []], 'sway-xkb': [['i3-common.c', 'i3-common.h'], [dynlist, json]], @@ -89,6 +89,10 @@ if plugin_label_enabled mod_data += {'label': [[], []]} endif +if plugin_network_enabled + mod_data += {'network': [[], []]} +endif + if plugin_pipewire_enabled mod_data += {'pipewire': [[], [pipewire, dynlist, json]]} endif diff --git a/plugin.c b/plugin.c index 9205df7..b08d5c5 100644 --- a/plugin.c +++ b/plugin.c @@ -66,7 +66,9 @@ EXTERN_MODULE(i3); #if defined(PLUGIN_ENABLED_LABEL) EXTERN_MODULE(label); #endif +#if defined(PLUGIN_ENABLED_NETWORK) EXTERN_MODULE(network); +#endif #if defined(PLUGIN_ENABLED_PULSE) EXTERN_MODULE(pulse); #endif @@ -178,7 +180,9 @@ init(void) #if defined(PLUGIN_ENABLED_LABEL) REGISTER_CORE_MODULE(label, label); #endif +#if defined(PLUGIN_ENABLED_NETWORK) REGISTER_CORE_MODULE(network, network); +#endif #if defined(PLUGIN_ENABLED_PULSE) REGISTER_CORE_MODULE(pulse, pulse); #endif