Cypher_Stack/libsecret
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libsecret.git synced 2024-12-22 20:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gcrypt-pkgconfig' into 'master'

Browse Source 
meson: Check for gcrypt with pkg-config first

See merge request GNOME/libsecret!20
This commit is contained in:
Daiki Ueno 2019-05-11 07:26:44 +00:00
commit d5becb2aaa
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meson.build
View File

@ -45,6 +45,8 @@ glib_deps = [
] ]
if with_gcrypt if with_gcrypt
min_libgcrypt_version = '1.2.2' min_libgcrypt_version = '1.2.2'
gcrypt_dep = dependency('libgcrypt', version: '>=' + min_libgcrypt_version, required: false)
if not gcrypt_dep.found()
libgcrypt_config = find_program('libgcrypt-config') libgcrypt_config = find_program('libgcrypt-config')
libgcrypt_version = run_command(libgcrypt_config, '--version').stdout().strip() libgcrypt_version = run_command(libgcrypt_config, '--version').stdout().strip()
if (libgcrypt_version.version_compare('>' + libgcrypt_version)) if (libgcrypt_version.version_compare('>' + libgcrypt_version))
@ -56,6 +58,7 @@ if with_gcrypt
link_args: run_command(libgcrypt_config, '--libs').stdout().strip().split(), link_args: run_command(libgcrypt_config, '--libs').stdout().strip().split(),
compile_args: run_command(libgcrypt_config, '--cflags').stdout().strip().split(), compile_args: run_command(libgcrypt_config, '--cflags').stdout().strip().split(),
) )
endif
endif endif
# Libraries # Libraries