New upstream version 1.37.92 upstream/1.37.92

1 files changed, 7 insertions, 4 deletions

diff --git a/meson.build b/meson.build
index f14aa62c..df7eb948 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@ project(
 #  - add corresponding NM_VERSION_x_y_z macros in
 #    "src/libnm-core-public/nm-version-macros.h.in"
 #  - update number in configure.ac
-  version: '1.36.4',
+  version: '1.37.92',
   license: 'GPL2+',
   default_options: [
     'buildtype=debugoptimized',
@@ -541,10 +541,11 @@ crypto = get_option('crypto')
 if crypto == 'nss'
     assert(crypto_nss_dep.found(), 'Requires nss crypto support')
     crypto_dep = crypto_nss_dep
-else
-    assert(crypto == 'gnutls', 'Unexpected setting "crypto=' + crypto + '"')
+elif crypto == 'gnutls'
     assert(crypto_gnutls_dep.found(), 'Requires gnutls crypto support')
     crypto_dep = crypto_gnutls_dep
+else
+    assert(crypto == 'null', 'Unexpected setting "crypto=' + crypto + '"')
 endif
 
 dbus_conf_dir = get_option('dbus_conf_dir')
@@ -1093,7 +1094,9 @@ output += '\n'
 output += '  code coverage: ' + get_option('b_coverage').to_string() + '\n'
 output += '  LTO: ' + enable_lto.to_string() + '\n'
 output += '  Linker garbage collection: ' + enable_ld_gc.to_string() + '\n'
-output += '  crypto: ' + crypto + '\n'
+output += '  crypto: ' + crypto + ' ('
+output +=      'have-gnutls: ' + crypto_gnutls_dep.found().to_string() + ', '
+output +=      'have-nss: ' + crypto_nss_dep.found().to_string() + ')\n'
 output += '  sanitizers: ' + get_option('b_sanitize') + '\n'
 output += '  Mozilla Public Suffix List: ' + enable_libpsl.to_string() + '\n'
 output += '  vapi: ' + enable_vapi.to_string() + '\n'