From 8fc4a788e1426b01381ef922f5c607d2f3a1582d Mon Sep 17 00:00:00 2001 From: orbea Date: Fri, 1 Nov 2019 08:38:35 -0700 Subject: [PATCH] qb: Make the pkgconfig check more simple pt. 2: --- qb/qb.comp.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/qb/qb.comp.sh b/qb/qb.comp.sh index 0468f281be..770ce45c7c 100644 --- a/qb/qb.comp.sh +++ b/qb/qb.comp.sh @@ -92,14 +92,12 @@ if [ "$OS" = "Win32" ]; then printf %s\\n "$echobuf ... $WINDRES" fi -if [ -z "$PKG_CONF_PATH" ]; then - PKGCONF="$(exists "${CROSS_COMPILE}pkgconf" || - exists "${CROSS_COMPILE}pkg-config" || :)" +printf %s 'Checking for pkg-config ... ' - PKG_CONF_PATH="${PKGCONF:-none}" -fi +PKG_CONF_PATH="${PKG_CONF_PATH:-$(exists "${CROSS_COMPILE}pkgconf" || + exists "${CROSS_COMPILE}pkg-config" || :)}" -printf %s\\n "Checking for pkg-config ... $PKG_CONF_PATH" +printf %s\\n "${PKG_CONF_PATH:=none}" if [ "$PKG_CONF_PATH" = "none" ]; then die : 'Warning: pkg-config not found, package checks will fail.'