diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-10-16 12:01:35 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-10-29 15:17:55 +0100 |
| commit | 4545b6cb1e87d1262ece4a3def17b74af4062758 (patch) | |
| tree | a368e4ff38fb1c5f169412e8b15193e1b8370223 /configure.ac | |
| parent | 99c9529b158c4c40bdd19b573652307baa1040d0 (diff) | |
| download | NetworkManager-4545b6cb1e87d1262ece4a3def17b74af4062758.tar.gz | |
config: set a compile time default for the main.plugins configuration option
In case of a missing NetworkManager.conf (or a missing configuration option
main.plugins), allow to determine the fallback at compile time
https://bugzilla.gnome.org/show_bug.cgi?id=738611
Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c6c9fc0bb9..f14fb8e0b5 100644 --- a/configure.ac +++ b/configure.ac @@ -117,6 +117,18 @@ AM_CONDITIONAL(CONFIG_PLUGIN_IFCFG_SUSE, test "$enable_ifcfg_suse" = "yes") AM_CONDITIONAL(CONFIG_PLUGIN_IFUPDOWN, test "$enable_ifupdown" = "yes") AM_CONDITIONAL(CONFIG_PLUGIN_IFNET, test "$enable_ifnet" = "yes") +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_ifcfg_suse" = "yes" && config_plugins_default="$config_plugins_default,ifcfg-suse" + test "$enable_ifupdown" = "yes" && config_plugins_default="$config_plugins_default,ifupdown" + test "$enable_ifnet" = "yes" && config_plugins_default="$config_plugins_default,ifnet" + test "$enable_config_plugin_ibft" = "yes" && config_plugins_default="$config_plugins_default,ibft" + config_plugins_default="${config_plugins_default#,}" +fi +AC_DEFINE_UNQUOTED(CONFIG_PLUGINS_DEFAULT, "$config_plugins_default", [Default configuration option for main.plugins setting]) + if test "$enable_ifcfg_rh" = "yes"; then DISTRO_NETWORK_SERVICE=network.service fi @@ -1014,7 +1026,7 @@ echo " libteamdctl: $enable_teamdctl" echo " nmtui: $build_nmtui" echo -echo "Configuration plugins" +echo "Configuration plugins (main.plugins=${config_plugins_default})" echo " ibft: ${enable_config_plugin_ibft}" echo " ifcfg-rh: ${enable_ifcfg_rh}" echo " ifcfg-suse: ${enable_ifcfg_suse}" |