summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-11-21 19:35:13 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-25 17:11:26 +0100
commit40290b06d32398700931f6218961056bd6e58fd0 (patch)
tree78fb33ff46e7214ba8024adcd151f59afa591ef7
parent484d6ce7764183b6d215310735eeef3e23332d1d (diff)
actually complain about invalid -[no-]{sql|imageformat}-* options
Change-Id: I0530d7dcdeb944db76bc708512c57e537f2c95c8 Reviewed-by: Vladimir Minenko <vminenko@rim.com> Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rwxr-xr-xconfigure9
1 files changed, 5 insertions, 4 deletions
diff --git a/configure b/configure
index 821cc5cd69..d0b0ed8ae2 100755
--- a/configure
+++ b/configure
@@ -1927,7 +1927,11 @@ while [ "$#" -gt 0 ]; do
break
fi
done
- [ "$found" = yes ] || ERROR=yes
+ if [ "$found" != "yes" ]; then
+ echo "$CURRENT_OPT: unknown argument"
+ ERROR=yes
+ continue
+ fi
if [ "$VAR" = "sql" ]; then
# set the CFG_SQL_driver
@@ -1951,9 +1955,6 @@ while [ "$#" -gt 0 ]; do
QMakeVar del "${IN_VAR}s" "$VAL"
QMakeVar del "${PLUG_VAR}s" "$VAL"
fi
- if [ "$ERROR" = "yes" ]; then
- echo "$CURRENT_OPT: unknown argument"
- fi
;;
v|verbose)
if [ "$VAL" = "yes" ]; then