Zebediah Figura : configure: Also try /usr/lib32/pkgconfig/ for the 32-bit PKG_CONFIG_PATH.
Alexandre Julliard
julliard at winehq.org
Mon Sep 16 16:33:43 CDT 2019
Module: wine
Branch: master
Commit: a6e237802159052e3add2e339fbd512069b45d82
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6e237802159052e3add2e339fbd512069b45d82
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Fri Sep 13 22:41:32 2019 -0500
configure: Also try /usr/lib32/pkgconfig/ for the 32-bit PKG_CONFIG_PATH.
As 20d41d9e2, but some distributions (e.g. Manjaro, and probably Arch in
general) use this path instead.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure | 2 +-
configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 163f545f6c..40f783349e 100755
--- a/configure
+++ b/configure
@@ -5606,7 +5606,7 @@ $as_echo "$wine_cv_cc_m32" >&6; }
notice_platform="32-bit "
TARGETFLAGS="-m32"
- PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig}
+ PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig}
export PKG_CONFIG_PATH
enable_win16=${enable_win16:-yes}
with_unwind=${with_unwind:-no}
diff --git a/configure.ac b/configure.ac
index ad7ed007e6..250b3c2d5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,7 +159,7 @@ 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}
+ PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig}
export PKG_CONFIG_PATH
enable_win16=${enable_win16:-yes}
with_unwind=${with_unwind:-no}
More information about the wine-cvs
mailing list