summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-06-17 11:21:40 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-19 20:01:45 +0200
commit1aaeb9538b8f001cee80eef75a15176e0d3910ed (patch)
treed31e4ade8b3d6d0fb7b26df4dc1017c12c5689c1 /configure
parent0343b926608a4014ef386b3b21be9a0940d9f8e8 (diff)
complain about bad arguments to -make/-nomake
Task-number: QTBUG-5366 Change-Id: I461a6c85fcee4a0216571d294171652b05ee6a34 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure9
1 files changed, 9 insertions, 0 deletions
diff --git a/configure b/configure
index 43d52a896b..de2b3483d9 100755
--- a/configure
+++ b/configure
@@ -876,6 +876,7 @@ CFG_SSE=auto
CFG_FONTCONFIG=auto
CFG_LIBFREETYPE=auto
CFG_SQL_AVAILABLE=
+QT_ALL_BUILD_PARTS=" libs tools examples tests "
QT_DEFAULT_BUILD_PARTS="libs tools examples"
CFG_BUILD_PARTS=""
CFG_NOBUILD_PARTS=""
@@ -1430,9 +1431,17 @@ while [ "$#" -gt 0 ]; do
fi
;;
nomake)
+ if [ -n "${QT_ALL_BUILD_PARTS%%* $VAL *}" ]; then
+ echo "Unknown part $VAL passed to -nomake." >&2
+ exit 1
+ fi
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
+ fi
CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL"
;;
skip)