summary refs log tree commit diff
path: root/meson.build
diff options
context:
space:
mode:
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build18
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')