diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-03-08 14:36:58 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-03-08 14:36:58 -0500 |
| commit | 53010f05df012183a1f9d9e7ca684b5fe722563d (patch) | |
| tree | e1e0cc839b8517d9392787d79bf4265a5e6f9b33 /meson.build | |
| parent | 9a04f21da9a5ab80d69c0d2832360d82c471916c (diff) | |
| parent | 0514770b02f34ccb56b6bc52010452663c6717ed (diff) | |
Merge tag 'debian/1.36.2-1' into ubuntu/master
network-manager Debian release 1.36.2-1
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/meson.build b/meson.build index 5f86ee05..d0cec83d 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project( # - add corresponding NM_VERSION_x_y_z macros in # "src/libnm-core-public/nm-version-macros.h.in" # - update number in configure.ac - version: '1.36.0', + version: '1.36.2', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', @@ -308,21 +308,11 @@ enable_ifcfg_rh = get_option('ifcfg_rh') or (distro == 'redhat') enable_ifupdown = get_option('ifupdown') or (distro == 'debian') config_plugins_default = get_option('config_plugins_default') -if config_plugins_default == '' - config_plugins = [] - - if enable_ifcfg_rh - config_plugins += ['ifcfg-rh'] - endif - - if enable_ifupdown - config_plugins += ['ifupdown'] - endif - - config_plugins_default = ','.join(config_plugins) -endif config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_PLUGINS', config_plugins_default) +config_h.set10('WITH_CONFIG_PLUGIN_IFCFG_RH', enable_ifcfg_rh) +config_h.set10('WITH_CONFIG_PLUGIN_IFUPDOWN', enable_ifupdown) + config_h.set_quoted('NM_DIST_VERSION', dist_version) enable_wifi = get_option('wifi') |