diff options
| author | Michael Biebl <biebl@debian.org> | 2017-04-21 23:45:54 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-24 19:25:33 -0400 |
| commit | 76c8741060bd0f5f64d9c05fd6b402e4e6e4eb66 (patch) | |
| tree | 1d038da4653cca8529797e996ea5de93a4a5eae4 /src | |
| parent | 36f0387efc0d7d3a72a7b0e3c94e513b14505d04 (diff) | |
meson: fix gcrypt config option
Also detect libgpg-error. Require both to be present for HAVE_CRYPT,
even though libgpg-error is only used in src/resolve. If one is available,
the other should be too, so it doesn't seem worth the trouble to make two
separate conditions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/journal/meson.build | 11 | ||||
| -rw-r--r-- | src/resolve/meson.build | 3 | ||||
| -rw-r--r-- | src/shared/meson.build | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/src/journal/meson.build b/src/journal/meson.build index 71396af529..37ec559e41 100644 --- a/src/journal/meson.build +++ b/src/journal/meson.build @@ -20,6 +20,17 @@ journal_internal_sources = files(''' sd-journal.c '''.split()) +if conf.get('HAVE_GCRYPT', 0) == 1 + journal_internal_sources += files(''' + journal-authenticate.c + journal-authenticate.h + fsprg.c + fsprg.h + '''.split()) + + journal_internal_sources += gcrypt_util_sources +endif + ############################################################ audit_type_includes = [config_h, diff --git a/src/resolve/meson.build b/src/resolve/meson.build index b8feb7bb1b..46a417e766 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build @@ -147,6 +147,7 @@ tests += [ 'src/shared/test-tables.h'], [], [libgcrypt, + libgpg_error, libm], 'ENABLE_RESOLVED'], @@ -155,6 +156,7 @@ tests += [ dns_type_headers], [], [libgcrypt, + libgpg_error, libm], 'ENABLE_RESOLVED'], @@ -163,6 +165,7 @@ tests += [ dns_type_headers], [], [libgcrypt, + libgpg_error, libm], 'ENABLE_RESOLVED'], diff --git a/src/shared/meson.build b/src/shared/meson.build index 5f48567817..8968127d3f 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -131,6 +131,7 @@ libshared = shared_library( libcap, libacl, libcryptsetup, + libgcrypt, libiptc, libseccomp, libselinux, |