Module: wine Branch: master Commit: 20d41d9e2810696ca38598abcef6da8e77f9aae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d41d9e2810696ca38598abce...
Author: Francois Gouget fgouget@codeweavers.com Date: Wed Jun 7 11:25:36 2017 +0200
configure: Set PKG_CONFIG_PATH to get the right settings for the target host.
Ideally we would use the right <triplet>-pkg-config tool for the target host. However Red Hat and SUSE respectively add '-redhat' and '-suse' to the triplet which makes it hard to find the right tool. Furthermore on Debian and derivatives a lot of development packages do not support multiarch so that the required .pc files would not be found.
Setting PKG_CONFIG_PATH side-steps the non-standard Red Hat and SUSE triplets. It also lets pkg-config fall back to the 'wrong' .pc files on Debian which is fine in most cases, while using the right one in cases where it matters (GStreamer 1.0), assuming they are actually present.
Signed-off-by: Francois Gouget fgouget@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 2 ++ configure.ac | 2 ++ 2 files changed, 4 insertions(+)
diff --git a/configure b/configure index d17ff5e..d12d186 100755 --- a/configure +++ b/configure @@ -5138,6 +5138,8 @@ rm -f core conftest.err conftest.$ac_objext \ notice_platform="32-bit " TARGETFLAGS="-m32"
+ PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} + export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} else if test "x${GCC}" = "xyes" diff --git a/configure.ac b/configure.ac index 129a8f6..d5e9456 100644 --- a/configure.ac +++ b/configure.ac @@ -151,6 +151,8 @@ case $host in host_cpu="i386" notice_platform="32-bit " AC_SUBST(TARGETFLAGS,"-m32") + PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig} + export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} else if test "x${GCC}" = "xyes"