(qb) Fix for PKG_CONF_PATH=none

This commit is contained in:
Higor Eurípedes 2015-04-19 10:56:57 -03:00
parent 1970e8005a
commit d3abc809c7
2 changed files with 10 additions and 6 deletions

View File

@ -79,8 +79,9 @@ if [ "$OS" = "Win32" ]; then
echo "$ECHOBUF ... $WINDRES"
fi
[ "$PKG_CONF_PATH" ] && [ "$PKG_CONF_PATH" != "none" ] || {
ECHOBUF="Checking for pkg-config"
ECHOBUF="Checking for pkg-config"
[ -n "$PKG_CONF_PATH" ] || {
PKG_CONF_PATH="none"
for path in $(which "${CROSS_COMPILE}pkg-config" 2>/dev/null) ''; do
@ -90,8 +91,10 @@ fi
}
done
echo "$ECHOBUF ... $PKG_CONF_PATH"
if [ "$PKG_CONF_PATH" = "none" ]; then
echo "Warning: pkg-config not found, package checks will fail."
fi
}
echo "$ECHOBUF ... $PKG_CONF_PATH"
if [ "$PKG_CONF_PATH" = "none" ]; then
echo "Warning: pkg-config not found, package checks will fail."
fi

View File

@ -108,6 +108,7 @@ check_pkgconf() #$1 = HAVE_$1 $2 = package $3 = version $4 = critical error mess
[ "$3" ] && ECHOBUF="$ECHOBUF >= $3"
[ "$PKG_CONF_PATH" = "none" ] && {
eval HAVE_$1="no"
echo "$ECHOBUF ... no"
return 0
}