diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2022-02-22 16:58:46 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2022-03-06 09:12:06 +0100 |
| commit | 392daa5dabdbabcd5025a125b3d358aeb2587161 (patch) | |
| tree | 55ac283e98163dbb95b97721e3166881d6028dd3 /configure.ac | |
| parent | f018afcd538d4eb2267bf5bcb5334db316642107 (diff) | |
| download | NetworkManager-392daa5dabdbabcd5025a125b3d358aeb2587161.tar.gz | |
core: fall back to loading all known settings plugins
Currently it is possible to specify a list of default settings plugins
to be used when configuration doesn't contain the main.plugins key.
We want to add a mechanism that allows to automatically load any
plugin found in the plugins directory without needing
configuration. This mechanism is useful when plugins are shipped in a
different, optional subpackage, to automatically use them.
With such mechanism, the actual list of plugins will be determined
(in order of evaluation):
1. via explicit user configuration in /etc, if any
2. via distro configuration in /usr, if any
3. using the build-time default, if any
4. looking for known plugins in /usr/lib
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index cd373d4d34..46013af1d8 100644 --- a/configure.ac +++ b/configure.ac @@ -185,12 +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 AC_DEFINE_UNQUOTED(NM_CONFIG_DEFAULT_MAIN_PLUGINS, "$config_plugins_default", [Default configuration option for main.plugins setting]) @@ -199,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 |