diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2022-01-14 09:55:51 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2022-01-14 09:55:53 +0100 |
| commit | 0047d36fa2bfff37ce8ae916122d01be5e6ed871 (patch) | |
| tree | bb6e73c1c27fa07d5f0e9a152134a7b964feb46b /meson.build | |
| parent | 9133a30c9deb3a003a20b09a617a25b07ada18ae (diff) | |
| parent | b2f507cab63294f55ce3f50bb5cc3b3845f1abfe (diff) | |
| download | NetworkManager-0047d36fa2bfff37ce8ae916122d01be5e6ed871.tar.gz | |
release: bump version to 1.35.5 (development)1.35.5-dev
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/meson.build b/meson.build index a02e43f959..48788275fe 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.34.0', + version: '1.35.5', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', @@ -389,6 +389,14 @@ if config_logging_backend_default == 'default' endif config_h.set_quoted('NM_CONFIG_DEFAULT_LOGGING_BACKEND', config_logging_backend_default) +config_wifi_backend_default = get_option('config_wifi_backend_default') +if config_wifi_backend_default == 'default' + config_wifi_backend_default = 'wpa_supplicant' +elif config_wifi_backend_default == 'iwd' + assert(enable_iwd, 'Setting the default Wi-Fi backend to iwd requires iwd support.') +endif +config_h.set_quoted('NM_CONFIG_DEFAULT_WIFI_BACKEND', config_wifi_backend_default) + session_tracking = get_option('session_tracking') session_trackers = [] @@ -890,6 +898,7 @@ data_conf.set('NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT', config_logging_backend_ data_conf.set('NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT', config_auth_polkit_default) data_conf.set('NM_CONFIG_DEFAULT_MAIN_DHCP', config_dhcp_default) data_conf.set('NM_CONFIG_DEFAULT_MAIN_RC_MANAGER', config_dns_rc_manager_default) +data_conf.set('NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT', config_wifi_backend_default) data_conf.set('NM_MAJOR_VERSION', nm_major_version) data_conf.set('NM_MICRO_VERSION', nm_micro_version) data_conf.set('NM_MINOR_VERSION', nm_minor_version) |