diff options
| author | Michael Biebl <biebl@debian.org> | 2022-03-07 21:30:42 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-03-07 21:30:42 +0100 |
| commit | 4f887bccf1cde84106588536584a2d54a5b4e6e5 (patch) | |
| tree | 454b1e2f3097b494dd9a4535815f382f214abf98 /meson.build | |
| parent | 4e966a21b9ef4fb910a5bd1a5699d404a65cfe55 (diff) | |
New upstream version 1.36.2 upstream/1.36.2
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') |