btrfs-progs: build: fix reported version of crypto libraries

The option --version actually reports version of pkg-config not the
module/library we're interested in.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2023-11-20 14:58:40 +01:00
parent afa23d4e27
commit 69a3871fdd

View File

@ -253,17 +253,17 @@ elif test "$with_crypto" = "libgcrypt"; then
cryptoprovider="libgcrypt" cryptoprovider="libgcrypt"
PKG_CHECK_MODULES(GCRYPT, [libgcrypt >= 1.8.0]) PKG_CHECK_MODULES(GCRYPT, [libgcrypt >= 1.8.0])
CRYPTOPROVIDER_LIBGCRYPT=1 CRYPTOPROVIDER_LIBGCRYPT=1
cryptoproviderversion=`${PKG_CONFIG} libgcrypt --version` cryptoproviderversion=`${PKG_CONFIG} libgcrypt --modversion`
elif test "$with_crypto" = "libsodium"; then elif test "$with_crypto" = "libsodium"; then
cryptoprovider="libsodium" cryptoprovider="libsodium"
PKG_CHECK_MODULES(SODIUM, [libsodium >= 1.0.4]) PKG_CHECK_MODULES(SODIUM, [libsodium >= 1.0.4])
CRYPTOPROVIDER_LIBSODIUM=1 CRYPTOPROVIDER_LIBSODIUM=1
cryptoproviderversion=`${PKG_CONFIG} libsodium --version` cryptoproviderversion=`${PKG_CONFIG} libsodium --modversion`
elif test "$with_crypto" = "libkcapi"; then elif test "$with_crypto" = "libkcapi"; then
cryptoprovider="libkcapi" cryptoprovider="libkcapi"
PKG_CHECK_MODULES(KCAPI, [libkcapi >= 1.0.0]) PKG_CHECK_MODULES(KCAPI, [libkcapi >= 1.0.0])
CRYPTOPROVIDER_LIBKCAPI=1 CRYPTOPROVIDER_LIBKCAPI=1
cryptoproviderversion=`${PKG_CONFIG} libkcapi --version` cryptoproviderversion=`${PKG_CONFIG} libkcapi --modversion`
else else
AC_MSG_ERROR([unrecognized crypto provider: $with_crypto]) AC_MSG_ERROR([unrecognized crypto provider: $with_crypto])
fi fi