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 /configure.ac | |
| 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 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index f755bf52..f6429cb2 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl "shared/nm-version-macros.h.in" dnl - update number in meson.build m4_define([nm_major_version], [1]) m4_define([nm_minor_version], [36]) -m4_define([nm_micro_version], [0]) +m4_define([nm_micro_version], [2]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) @@ -185,16 +185,6 @@ AC_ARG_WITH(config-plugins-default, AS_HELP_STRING([--with-config-plugins-default=PLUGINS], [Default configuration option for main.plugins setting, used as fallback if the configuration option is unset]), [config_plugins_default="$withval"], [config_plugins_default=""]) -if test -z "$config_plugins_default" -o "$config_plugins_default" = no; then - config_plugins_default='' - test "$enable_ifcfg_rh" = "yes" && config_plugins_default="$config_plugins_default,ifcfg-rh" - test "$enable_ifupdown" = "yes" && config_plugins_default="$config_plugins_default,ifupdown" - config_plugins_default="${config_plugins_default#,}" -fi - -test "$enable_ifcfg_rh" = "yes" && distro_plugins="$distro_plugins,ifcfg-rh" -test "$enable_ifupdown" = "yes" && distro_plugins="$distro_plugins,ifupdown" -distro_plugins="${distro_plugins#,}" AC_DEFINE_UNQUOTED(NM_CONFIG_DEFAULT_MAIN_PLUGINS, "$config_plugins_default", [Default configuration option for main.plugins setting]) @@ -203,6 +193,18 @@ if test "$enable_ifcfg_rh" = "yes"; then fi AC_SUBST(DISTRO_NETWORK_SERVICE) +if test "$enable_ifcfg_rh" = yes; then + AC_DEFINE(WITH_CONFIG_PLUGIN_IFCFG_RH, 1, [Build with ifcfg-rh settings plugin]) +else + AC_DEFINE(WITH_CONFIG_PLUGIN_IFCFG_RH, 0, [Build with ifcfg-rh settings plugin]) +fi + +if test "$enable_ifupdown" = yes; then + AC_DEFINE(WITH_CONFIG_PLUGIN_IFUPDOWN, 1, [Build with ifupdown settings plugin]) +else + AC_DEFINE(WITH_CONFIG_PLUGIN_IFUPDOWN, 0, [Build with ifupdown settings plugin]) +fi + # Code coverage GNOME_CODE_COVERAGE |