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: Set PKG_CONFIG_PATH to get the right settings for the target host.
20d41d9e · Francois Gouget · Alexandre Julliard · 2b03d207 · 20d41d9e · 20d41d9e
Commit 20d41d9e authored Jun 07, 2017 by Francois Gouget Committed by Alexandre Julliard Jun 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

configure configure +2 -0

configure.ac configure.ac +2 -0

No files found.
--- 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"

--- 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"