If libgcrypt info is available with pkg-config use it over using the libgcrypt-config. pkg-config is preferred due to is compatibility with cross-compilation (where you cannot execute the targets version of libgcrypt-config).
This change makes configure check for libgcrypt in pkg-config first, then falling back to use libgcrypt-config if available. This follows a similar process to how libsdl is handled. Signed-off-by: Nathan Rossi <nat...@nathanrossi.com> --- configure | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 218df87d21..6558121de8 100755 --- a/configure +++ b/configure @@ -2386,9 +2386,17 @@ has_libgcrypt_config() { } if test "$gcrypt" != "no"; then - if has_libgcrypt_config; then - gcrypt_cflags=$(libgcrypt-config --cflags) - gcrypt_libs=$(libgcrypt-config --libs) + gcrypt_config="" + # If libgcrypt in pkg-config use it over using libgcrypt-config + if $pkg_config --exists "libgcrypt"; then + gcrypt_config="$pkg_config libgcrypt" + elif has_libgcrypt_config; then + gcrypt_config="libgcrypt-config" + fi + + if test -n "$gcrypt_config"; then + gcrypt_cflags=$($gcrypt_config --cflags) + gcrypt_libs=$($gcrypt_config --libs) # Debian has remove -lgpg-error from libgcrypt-config # as it "spreads unnecessary dependencies" which in # turn breaks static builds... -- 2.11.0