diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-10-21 09:13:33 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-10-29 15:17:55 +0100 |
| commit | 99c9529b158c4c40bdd19b573652307baa1040d0 (patch) | |
| tree | 0864269420002efa7e7b35992f4b56778a349030 | |
| parent | f77b8460d037c1cae45e666629a60682c77deaa7 (diff) | |
| download | NetworkManager-99c9529b158c4c40bdd19b573652307baa1040d0.tar.gz | |
build: add configure option for ibft plugin
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/settings/plugins/Makefile.am | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 7ef899a122..c6c9fc0bb9 100644 --- a/configure.ac +++ b/configure.ac @@ -91,6 +91,7 @@ AC_SUBST(nmstatedir, "$localstatedir/lib/$PACKAGE", [NetworkManager persistent s AC_SUBST(nmrundir, "$localstatedir/run/$PACKAGE", [NetworkManager runtime state directory]) # Alternative configuration plugins +AC_ARG_ENABLE(config-plugin-ibft, AS_HELP_STRING([--enable-config-plugin-ibft], [enable ibft configuration plugin])) AC_ARG_ENABLE(ifcfg-rh, AS_HELP_STRING([--enable-ifcfg-rh], [enable ifcfg-rh configuration plugin (Fedora/RHEL)])) AC_ARG_ENABLE(ifcfg-suse, AS_HELP_STRING([--enable-ifcfg-suse], [enable ifcfg-suse configuration plugin (SUSE)])) AC_ARG_ENABLE(ifupdown, AS_HELP_STRING([--enable-ifupdown], [enable ifupdown configuration plugin (Debian/Ubuntu)])) @@ -107,7 +108,10 @@ AS_IF([test -z "$enable_ifcfg_rh"], enable_ifcfg_rh=no) AS_IF([test -z "$enable_ifcfg_suse"], enable_ifcfg_suse=no) AS_IF([test -z "$enable_ifupdown"], enable_ifupdown=no) AS_IF([test -z "$enable_ifnet"], enable_ifnet=no) +# Enable ibft by default +AS_IF([test -z "$enable_config_plugin_ibft"], enable_config_plugin_ibft="yes") # Create automake conditionals +AM_CONDITIONAL(CONFIG_PLUGIN_IBFT, test "$enable_config_plugin_ibft" = "yes") AM_CONDITIONAL(CONFIG_PLUGIN_IFCFG_RH, test "$enable_ifcfg_rh" = "yes") AM_CONDITIONAL(CONFIG_PLUGIN_IFCFG_SUSE, test "$enable_ifcfg_suse" = "yes") AM_CONDITIONAL(CONFIG_PLUGIN_IFUPDOWN, test "$enable_ifupdown" = "yes") @@ -1011,6 +1015,7 @@ echo " nmtui: $build_nmtui" echo echo "Configuration plugins" +echo " ibft: ${enable_config_plugin_ibft}" echo " ifcfg-rh: ${enable_ifcfg_rh}" echo " ifcfg-suse: ${enable_ifcfg_suse}" echo " ifupdown: ${enable_ifupdown}" diff --git a/src/settings/plugins/Makefile.am b/src/settings/plugins/Makefile.am index 22f4171073..568da7f6ac 100644 --- a/src/settings/plugins/Makefile.am +++ b/src/settings/plugins/Makefile.am @@ -1,7 +1,11 @@ -SUBDIRS=keyfile example ibft +SUBDIRS=keyfile example @GNOME_CODE_COVERAGE_RULES@ +if CONFIG_PLUGIN_IBFT +SUBDIRS+=ibft +endif + if CONFIG_PLUGIN_IFCFG_RH SUBDIRS+=ifcfg-rh endif |