summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorGatis Paeglis <gatis.paeglis@digia.com>2013-05-06 21:33:57 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-07 20:40:41 +0200
commit9953393593e885d981331a2e01bc9f2c868b939a (patch)
tree1adf6d3628f2ef6cf8938be818e03e644fccc653 /configure
parent51c6800a1939c065b2b3da3dba74ba3af6518607 (diff)
Make the configure script to accept "-no-harfbuzz" switch
./configure -h lists "-no-harfbuzz" as a valid option, configuring with this switch gives an error message: "-no-harfbuzz: invalid command-line switch" Change-Id: I77aa68d17805170189150198dc9abea5f8cfa5c2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 9c86fa1e5d..e112999508 100755
--- a/configure
+++ b/configure
@@ -1409,7 +1409,7 @@ while [ "$#" -gt 0 ]; do
OPT_OBSOLETE_HOST_ARG=yes
;;
harfbuzz)
- if [ "$BUILD_ON_MAC" = "yes" ] && [ "$VAL" = "yes" ]; then
+ if ([ "$BUILD_ON_MAC" = "yes" ] && [ "$VAL" = "yes" ]) || [ "$VAL" = "no" ]; then
CFG_MAC_HARFBUZZ="$VAL"
else
UNKNOWN_OPT=yes