diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2020-03-11 11:49:08 +0100 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2021-01-13 10:34:22 +0000 |
| commit | 5aa74c851419cf72da85ac5394f41ed86e6f8461 (patch) | |
| tree | c0b4483e95d0995d4af08b941ac4f0bb696517cb /meson.build | |
| parent | 979c0de797476f2080aeb6fffbab50296065ba91 (diff) | |
| download | gcr-5aa74c851419cf72da85ac5394f41ed86e6f8461.tar.gz | |
meson: allow building without gpg(2) installed
This avoids circular dependencies, such as gcr -> gpg2 -> pinentry -> gcr
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meson.build b/meson.build index a26a0f9..02b4c3c 100644 --- a/meson.build +++ b/meson.build @@ -41,7 +41,10 @@ gobject_dep = dependency('gobject-2.0', version: '>=' + min_glib_version) gio_dep = dependency('gio-2.0', version: '>=' + min_glib_version) gio_unix_dep = dependency('gio-unix-2.0',version: '>=' + min_glib_version) glib_deps = [ glib_dep, gmodule_dep, gthread_dep, gobject_dep, gio_dep, gio_unix_dep, ] -gpg_bin = find_program('gpg2', 'gpg') +gpg_path = get_option('gpg_path') +if gpg_path == '' + gpg_path = find_program('gpg2', 'gpg').path() +endif libgcrypt_dep = dependency('libgcrypt', version: '>= 1') p11kit_dep = dependency('p11-kit-1', version: '>= 0.19.0') p11_system_config_modules = p11kit_dep.get_pkgconfig_variable('p11_system_config_modules') @@ -65,7 +68,7 @@ conf.set('HAVE_GETTEXT', true) conf.set('HAVE_LOCALE_H', cc.has_header('locale.h')) conf.set('HAVE_TIMEGM', cc.has_function('timegm')) conf.set('HAVE_MLOCK', cc.has_function('mlock')) -conf.set_quoted('GPG_EXECUTABLE', gpg_bin.path()) +conf.set_quoted('GPG_EXECUTABLE', gpg_path) conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version()) config_file = configure_file( output: 'config.h', |