Wine uses the wrong pkg-config for 32 bit builds

[Alexandre Julliard]

Francois Gouget <fgouget at codeweavers.com> writes:

> We already have a WINE_CHECK_HOST_TOOL() macro that looks like it should 
> do the trick. But it only takes ac_tool_prefix into account. So I 
> modified it to take the host target into account if ac_tool_prefix is 
> not set. This is modeled after the WINE_CHECK_MINGW_PROG macro and you 
> can see the result in the patch below.

It seems to me that you'd want to do this only in the specific case that
we force 32-bit, other cases should be handled by the normal --host
mechanism. Maybe something like this:

diff --git a/configure.ac b/configure.ac
index 129a8f62c7e2..1d84e6d17d10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,6 +151,7 @@ case $host in
       host_cpu="i386"
       notice_platform="32-bit "
       AC_SUBST(TARGETFLAGS,"-m32")
+      AC_CHECK_PROGS([PKG_CONFIG],[i686-${host_os}-pkg-config],[])
       enable_win16=${enable_win16:-yes}
     else
       if test "x${GCC}" = "xyes"

-- 
Alexandre Julliard
julliard at winehq.org