diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2022-05-17 15:30:19 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2022-05-17 15:30:19 +0200 |
| commit | 1e636d8e5e986b9f2260c36bb87fb499d724085c (patch) | |
| tree | ac613b9372adf622496a7d616050d7e1c09b4fba /meson.build | |
| parent | f4966e573c855d4667e6c236d8197d9949020e21 (diff) | |
| parent | 1a31bc3c63474ca02c83b02add85ea4e740e5597 (diff) | |
Merge remote-tracking branch 'debian/debian/master' into ubuntu/master
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/meson.build b/meson.build index d0cec83d..7a7eb176 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.2', + version: '1.38.0', 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' |