summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-06-17 11:49:53 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-19 20:02:21 +0200
commit77d903ae1a2331402b49555a44ef829dced87192 (patch)
tree27598a80cd1a8315895db0775a00e21949070b1e /configure
parent1aaeb9538b8f001cee80eef75a15176e0d3910ed (diff)
catch accidental use of -no-make
the option the user most likely meant is called -nomake. Task-number: QTBUG-21778 Change-Id: I6d8c4d5a984c929804f49ffc2ac75f6945f76e81 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure12
1 files changed, 8 insertions, 4 deletions
diff --git a/configure b/configure
index de2b3483d9..13e6fd016a 100755
--- a/configure
+++ b/configure
@@ -1438,11 +1438,15 @@ while [ "$#" -gt 0 ]; do
CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS $VAL"
;;
make)
- if [ -n "${QT_ALL_BUILD_PARTS%%* $VAL *}" ]; then
- echo "Unknown part $VAL passed to -make." >&2
- exit 1
+ if [ "$VAL" = "no" ]; then
+ UNKNOWN_OPT=yes
+ else
+ if [ -n "${QT_ALL_BUILD_PARTS%%* $VAL *}" ]; then
+ echo "Unknown part $VAL passed to -make." >&2
+ exit 1
+ fi
+ CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL"
fi
- CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL"
;;
skip)
VAL=qt${VAL#qt}