(qb) Fix for PKG_CONF_PATH=none

mme4crt · Apr 19, 2015 · d3abc80 · d3abc80
1 parent 1970e80
commit d3abc80
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/qb/qb.comp.sh b/qb/qb.comp.sh
@@ -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
diff --git a/qb/qb.libs.sh b/qb/qb.libs.sh
@@ -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
 	}