[Scummvm-git-logs] scummvm master -> f01a1dc6fa5083293791f9eade2decab094afc25

[orgads]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f01a1dc6fa CONFIGURE: Use cross-pkg-config on MXE


Commit: f01a1dc6fa5083293791f9eade2decab094afc25
    https://github.com/scummvm/scummvm/commit/f01a1dc6fa5083293791f9eade2decab094afc25
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-08-01T07:27:16+03:00

Commit Message:
CONFIGURE: Use cross-pkg-config on MXE

Works without setting PKG_CONFIG_LIBDIR.

Changed paths:
    configure


diff --git a/configure b/configure
index 241578749a..d8f4d5edd1 100755
--- a/configure
+++ b/configure
@@ -3411,6 +3411,7 @@ if test -n "$_host"; then
 		*mingw32*)
 			_sdlconfig=$_host-sdl2-config
 			_libcurlconfig=$_host-curl-config
+			_pkgconfig=$_host-pkg-config
 			_windres=$_host-windres
 			_ar="$_host-ar cr"
 			_ranlib=$_host-ranlib
@@ -3726,7 +3727,7 @@ _pkg_config=no
 command -v $_pkgconfig >/dev/null 2>&1 && _pkg_config=yes
 echo "$_pkg_config"
 
-if test "$_pkg_config" = yes && test -n "$_host" && test -z "$PKG_CONFIG_LIBDIR"; then
+if test "$_pkg_config" = yes && test -n "$_host" && test -z "$PKG_CONFIG_LIBDIR" && test "$_pkgconfig" = pkg-config; then
 	echo "WARNING: When cross-compiling PKG_CONFIG_LIBDIR must be set to the location of the .pc files for the target"
 fi