diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-01-10 07:08:57 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-01-10 12:27:33 +0100 |
| commit | ca9418232ca31ac1007bd762192ef1eb07707098 (patch) | |
| tree | 5e0f53f163554c9e0f0dd1e7231841b4b9ed9e13 | |
| parent | 619de16f3c562ef0e5d45f5d77ce922138fd70b9 (diff) | |
| download | NetworkManager-ca9418232ca31ac1007bd762192ef1eb07707098.tar.gz | |
build/meson: rename config_plugin_ibft option to just ibft
| -rw-r--r-- | meson.build | 8 | ||||
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rw-r--r-- | src/settings/plugins/meson.build | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/meson.build b/meson.build index 75f542084e..72b6141b36 100644 --- a/meson.build +++ b/meson.build @@ -240,9 +240,9 @@ endif enable_ifcfg_rh = get_option('ifcfg_rh') or (distro == 'redhat') enable_ifupdown = get_option('ifupdown') or (distro == 'debian') +enable_ibft = get_option('ibft') or enable_ifcfg_rh -enable_config_plugin_ibft = get_option('config_plugin_ibft') -config_h.set10('WITH_SETTINGS_PLUGIN_IBFT', enable_config_plugin_ibft) +config_h.set10('WITH_SETTINGS_PLUGIN_IBFT', enable_ibft) config_plugins_default = get_option('config_plugins_default') if config_plugins_default == '' @@ -256,7 +256,7 @@ if config_plugins_default == '' config_plugins += ['ifupdown'] endif - if enable_config_plugin_ibft + if enable_ibft config_plugins += ['ibft'] endif @@ -981,7 +981,7 @@ output += ' libnm-glib: ' + enable_libnm_glib.to_string() + '\n' output += ' nmcli: ' + enable_nmcli.to_string() + '\n' output += ' nmtui: ' + enable_nmtui.to_string() + '\n' output += '\nConfiguration_plugins (main.plugins=' + config_plugins_default + ')\n' -output += ' ibft: ' + enable_config_plugin_ibft.to_string() + '\n' +output += ' ibft: ' + enable_ibft.to_string() + '\n' output += ' ifcfg-rh: ' + enable_ifcfg_rh.to_string() + '\n' output += ' ifupdown: ' + enable_ifupdown.to_string() + '\n' output += '\nHandlers for /etc/resolv.conf:\n' diff --git a/meson_options.txt b/meson_options.txt index 0cda980012..cd904c5f57 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -44,7 +44,7 @@ option('bluez5_dun', type: 'boolean', value: false, description: 'enable Bluez5 # configuration plugins option('config_plugins_default', type: 'string', value: '', description: 'Default configuration option for main.plugins setting, used as fallback if the configuration option is unset') -option('config_plugin_ibft', type: 'boolean', value: true, description: 'enable ibft configuration plugin') +option('ibft', type: 'boolean', value: false, description: 'enable ibft configuration plugin') option('ifcfg_rh', type: 'boolean', value: false, description: 'enable ifcfg-rh configuration plugin (Fedora/RHEL)') option('ifupdown', type: 'boolean', value: false, description: 'enable ifupdown configuration plugin (Debian/Ubuntu)') diff --git a/src/settings/plugins/meson.build b/src/settings/plugins/meson.build index 1b5edbd46e..a1aa7823aa 100644 --- a/src/settings/plugins/meson.build +++ b/src/settings/plugins/meson.build @@ -1,5 +1,5 @@ -if enable_tests - subdir('keyfile/tests') +if enable_ibft + subdir('ibft') endif if enable_ifcfg_rh @@ -10,6 +10,6 @@ if enable_ifupdown subdir('ifupdown') endif -if enable_config_plugin_ibft - subdir('ibft') +if enable_tests + subdir('keyfile/tests') endif |