[gnome-settings-daemon/benzea/systemd-3-36] meson: Make usb-protection plugin build time configurable



commit 17a5553c8b22fed094d2eb9bdf25829120d4b54e
Author: Benjamin Berg <bberg redhat com>
Date:   Wed Jan 22 14:33:25 2020 +0100

    meson: Make usb-protection plugin build time configurable

 meson.build         | 3 +++
 meson_options.txt   | 1 +
 plugins/meson.build | 4 ++++
 3 files changed, 8 insertions(+)
---
diff --git a/meson.build b/meson.build
index 12d05c40..5aa4c61b 100644
--- a/meson.build
+++ b/meson.build
@@ -167,6 +167,8 @@ if enable_smartcard
   endif
 endif
 
+enable_usb_protection = get_option('usb-protection')
+
 # CUPS
 enable_cups = get_option('cups')
 if enable_cups
@@ -254,6 +256,7 @@ output += '        cflags:                   ' + ' '.join(compiler_flags) + '\n\
 output += '        ALSA support:             ' + enable_alsa.to_string() + '\n'
 output += '        NetworkManager support:   ' + enable_network_manager.to_string() + '\n'
 output += '        Smartcard support:        ' + enable_smartcard.to_string() + '\n'
+output += '        USB Protection support:   ' + enable_usb_protection.to_string() + '\n'
 output += '        Cups support:             ' + enable_cups.to_string() + '\n'
 output += '        Wayland support:          ' + enable_wayland.to_string() + '\n'
 output += '        Wacom support:            ' + enable_wacom.to_string() + '\n'
diff --git a/meson_options.txt b/meson_options.txt
index 542c3b28..15dd8251 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -8,5 +8,6 @@ option('cups', type: 'boolean', value: true, description: 'build with CUPS suppo
 option('network_manager', type: 'boolean', value: true, description: 'build with NetworkManager support (not 
optional on Linux platforms)')
 option('rfkill', type: 'boolean', value: true, description: 'build with rfkill support (not optional on 
Linux platforms)')
 option('smartcard', type: 'boolean', value: true, description: 'build with smartcard support')
+option('usb-protection', type: 'boolean', value: true, description: 'build with usb-protection support')
 option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
 option('wwan', type: 'boolean', value: true, description: 'build with WWAN support')
diff --git a/plugins/meson.build b/plugins/meson.build
index d8245980..8af04040 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -24,6 +24,10 @@ if not enable_smartcard
     disabled_plugins += ['smartcard']
 endif
 
+if not enable_usb_protection
+    disabled_plugins += ['usb-protection']
+endif
+
 if not enable_wacom
     disabled_plugins += ['wacom']
 endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]