summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-07-22 20:33:15 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-05 20:15:53 +0200
commit6901d21c1dca04228460c8520266ad2a16d5d523 (patch)
treeebe26ec9102e349e22b7abee6924b4e9228b7229
parent8fce4e97ba8479a24bff167ce72ed43223076905 (diff)
reject unrecognized -no-l* options
the -l* fallback is for adding libraries. it obviously makes no sense in its negated form. Task-number: QTBUG-32550 Change-Id: I9f3af9a2fc059ba39987d4b197ed4778cc7f35b6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rwxr-xr-xconfigure14
1 files changed, 11 insertions, 3 deletions
diff --git a/configure b/configure
index 834b35cdbd..9cbb6ff7fb 100755
--- a/configure
+++ b/configure
@@ -2342,11 +2342,19 @@ while [ "$#" -gt 0 ]; do
CFG_DEFAULT_ANDROID_NDK_TOOLCHAIN_VERSION="$VAL"
;;
l*) # -lfoo
- L_FLAGS="$L_FLAGS -l\"${VAR#l}\""
+ if [ "$VAL" = "yes" ]; then
+ L_FLAGS="$L_FLAGS -l\"${VAR#l}\""
+ else
+ UNKNOWN_OPT=yes
+ fi
;;
fw*) # -fwfoo
- if [ "$BUILD_ON_MAC" = "yes" ]; then
- L_FLAGS="$L_FLAGS -framework \"${VAR#fw}\""
+ if [ "$VAL" = "yes" ]; then
+ if [ "$BUILD_ON_MAC" = "yes" ]; then
+ L_FLAGS="$L_FLAGS -framework \"${VAR#fw}\""
+ else
+ UNKNOWN_OPT=yes
+ fi
else
UNKNOWN_OPT=yes
fi