diff --git a/qb/qb.comp.sh b/qb/qb.comp.sh index c396be5347..8231db141a 100644 --- a/qb/qb.comp.sh +++ b/qb/qb.comp.sh @@ -78,3 +78,20 @@ if [ "$OS" = "Win32" ]; then fi echo "$ECHOBUF ... $WINDRES" fi + +[ "$PKG_CONF_PATH" ] && [ "$PKG_CONF_PATH" != "none" ] || { + ECHOBUF="Checking for pkg-config" + PKG_CONF_PATH="none" + + for path in $(which "${CROSS_COMPILE}pkg-config" 2>/dev/null) ''; do + [ -n "$path" ] && { + PKG_CONF_PATH=$path; + break; + } + done + + echo "$ECHOBUF ... $PKG_CONF_PATH" + if [ "$PKG_CONF_PATH" = "none" ] && [ "$OS" != "Darwin" ]; then + echo "Warning: pkg-config not found, package checks will fail." + fi +} diff --git a/qb/qb.libs.sh b/qb/qb.libs.sh index 1f5312e458..54f2753f5e 100644 --- a/qb/qb.libs.sh +++ b/qb/qb.libs.sh @@ -104,17 +104,14 @@ check_pkgconf() #$1 = HAVE_$1 $2 = package $3 = version $4 = critical error mess { tmpval="$(eval echo \$HAVE_$1)" [ "$tmpval" = 'no' ] && return 0 - [ "$PKG_CONF_PATH" ] || { - ECHOBUF="Checking for pkg-config" -# echo -n "Checking for pkg-config" - for PKG_CONF_PATH in $(which "${CROSS_COMPILE}pkg-config") ''; do [ "$PKG_CONF_PATH" ] && break; done - [ "$PKG_CONF_PATH" ] || { echo "pkg-config not found. Exiting ..."; exit 1;} - echo "$ECHOBUF ... $PKG_CONF_PATH" - } - ECHOBUF="Checking presence of package $2" [ "$3" ] && ECHOBUF="$ECHOBUF >= $3" -# echo -n "$ECHOBUF ... " + + [ "$PKG_CONF_PATH" = "none" ] && { + echo "$ECHOBUF ... no" + return 0 + } + answer='no' version='no' $PKG_CONF_PATH --atleast-version="${3:-0.0}" "$2" && {