diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 24538188..cff7a03b 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], [24]) -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]) @@ -673,6 +673,18 @@ else fi AC_SUBST(NM_MODIFY_SYSTEM_POLICY) +AC_ARG_ENABLE(firewalld-zone, + AS_HELP_STRING([--enable-firewalld-zone], [Install and use firewalld zone for shared mode]), + [enable_firewalld_zone=${enableval}], + [enable_firewalld_zone=yes]) + +if test "${enable_firewalld_zone}" = "yes"; then + AC_DEFINE(WITH_FIREWALLD_ZONE, 1, [Define if NetworkManager uses a custom zone for shared mode]) +else + AC_DEFINE(WITH_FIREWALLD_ZONE, 0, [Define if NetworkManager uses a custom zone for shared mode]) +fi +AM_CONDITIONAL(WITH_FIREWALLD_ZONE, test "${enable_firewalld_zone}" = "yes") + PKG_CHECK_MODULES(GNUTLS, [gnutls >= 2.12], [have_crypto_gnutls=yes], [have_crypto_gnutls=no]) PKG_CHECK_MODULES(NSS, [nss], [have_crypto_nss=yes], [have_crypto_nss=yes]) if test "${have_crypto_nss}" = "yes"; then @@ -1137,6 +1149,10 @@ if test "$with_address_sanitizer" = yes -o "$with_address_sanitizer" = "exec"; t else sanitizers="${sanitizers}address(executables-only) " fi +elif test "$with_address_sanitizer" = "" -o "$with_address_sanitizer" = no; then + with_address_sanitizer=no +else + AC_MSG_ERROR(["Invalid asan option --with-address-sanitizer=$with_address_sanitizer"]) fi AC_ARG_ENABLE(undefined-sanitizer, @@ -1152,6 +1168,10 @@ if test "${enable_undefined_sanitizer}" = "yes"; then sanitizer_exec_ldflags="$sanitizer_exec_ldflags -Wc,-fsanitize=undefined" sanitizer_lib_ldflags="$sanitizer_lib_ldflags -Wc,-fsanitize=undefined" sanitizers="${sanitizers}undefined-behavior " +elif test "$enable_undefined_sanitizer" = "" -o "$enable_undefined_sanitizer" = no; then + enable_undefined_sanitizer=no +else + AC_MSG_ERROR(["Invalid asan option --enable-undefined-sanitizer=$enable_undefined_sanitizer"]) fi if test -n "$sanitizers"; then @@ -1310,6 +1330,7 @@ echo " nmlibdir: $nmlibdir" echo " nmdatadir: $nmdatadir" echo " nmstatedir: $nmstatedir" echo " nmrundir: $nmrundir" +echo " system-ca-path: $with_system_ca_path" echo echo "Platform:" @@ -1362,6 +1383,7 @@ echo "Miscellaneous:" echo " have introspection: $have_introspection" echo " build documentation and manpages: $build_docs" echo " install pregenerated documentation and manpages: $use_pregen_docs" +echo " install and use firewalld shared zone: $enable_firewalld_zone" echo " tests: $enable_tests" echo " more-asserts: $more_asserts" echo " more-logging: $enable_more_logging" |