Przeglądaj źródła

crypto: Allow building with GnuTLS but without Libtasn1

We only use Libtasn1 in unit tests. As noted in commit d47b83b118
("tests: add migration tests of TLS with x509 credentials"), having
GnuTLS without Libtasn1 is a valid configuration, so do not require
Libtasn1, to avoid:

  Dependency gnutls found: YES 3.7.1 (cached)
  Run-time dependency libtasn1 found: NO (tried pkgconfig)

  ../meson.build:1914:10: ERROR: Dependency "libtasn1" not found, tried pkgconfig

Fixes: ba7ed407e6 ("configure, meson: convert libtasn1 detection to meson")
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Philippe Mathieu-Daudé 1 rok temu
rodzic
commit
dc37d1c56b
1 zmienionych plików z 1 dodań i 0 usunięć
  1. 1 0
      meson.build

+ 1 - 0
meson.build

@@ -1979,6 +1979,7 @@ endif
 tasn1 = not_found
 tasn1 = not_found
 if gnutls.found()
 if gnutls.found()
   tasn1 = dependency('libtasn1',
   tasn1 = dependency('libtasn1',
+                     required: false,
                      method: 'pkg-config')
                      method: 'pkg-config')
 endif
 endif
 keyutils = not_found
 keyutils = not_found