On Tue, Mar 9, 2021 at 4:36 PM Heiko Becker <heire...@exherbo.org> wrote:
>
> Hard-coding the pkg-config executable might result in build errors
> on system and cross environments that have prefixed toolchains. The
> PKG_CONFIG variable already holds the proper one and is already used
> in a few other places.
>
> Signed-off-by: Heiko Becker <heire...@exherbo.org>
> ---
> configure.ac | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 1b0e92f9..612a3f87 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -223,17 +223,17 @@ elif test "$with_crypto" = "libgcrypt"; then
> cryptoprovider="libgcrypt"
> PKG_CHECK_MODULES(GCRYPT, [libgcrypt >= 1.8.0])
> AC_DEFINE([CRYPTOPROVIDER_LIBGCRYPT],[1],[Use libcrypt])
> - cryptoproviderversion=`pkg-config libgcrypt --version`
> + cryptoproviderversion=`${PKG_CONFIG} libgcrypt --version`
> elif test "$with_crypto" = "libsodium"; then
> cryptoprovider="libsodium"
> PKG_CHECK_MODULES(SODIUM, [libsodium >= 1.0.4])
> AC_DEFINE([CRYPTOPROVIDER_LIBSODIUM],[1],[Use libsodium])
> - cryptoproviderversion=`pkg-config libsodium --version`
> + cryptoproviderversion=`${PKG_CONFIG} libsodium --version`
> elif test "$with_crypto" = "libkcapi"; then
> cryptoprovider="libkcapi"
> PKG_CHECK_MODULES(KCAPI, [libkcapi >= 1.0.0])
> AC_DEFINE([CRYPTOPROVIDER_LIBKCAPI],[1],[Use libkcapi])
> - cryptoproviderversion=`pkg-config libkcapi --version`
> + cryptoproviderversion=`${PKG_CONFIG} libkcapi --version`
> else
> AC_MSG_ERROR([unrecognized crypto provider: $with_crypto])
> fi
> --
> 2.31.0.rc2
>
Looks good to me.
Reviewed-by: Neal Gompa <ngomp...@gmail.com>
--
真実はいつも一つ！/ Always, there's only one truth!
