From c41dd40bff781df2aa570066159a72b823d159e7 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 4 Jul 2016 10:44:39 +0200 Subject: Fix ssl handling in configure to be compatible with configure.exe Change-Id: I0fdd3aebaa9d2a4c68ee6ebc0b7a24868f3c2aa5 Reviewed-by: Lars Knoll Reviewed-by: Oswald Buddenhagen --- configure.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configure.json') diff --git a/configure.json b/configure.json index 6f4ab05499..976903fd51 100644 --- a/configure.json +++ b/configure.json @@ -162,6 +162,7 @@ "sse3": "boolean", "sse4.1": { "type": "boolean", "name": "sse4_1" }, "sse4.2": { "type": "boolean", "name": "sse4_2" }, + "ssl": "boolean", "ssse3": "boolean", "static": { "type": "enum", "name": "shared", "values": { "yes": "no", "no": "yes" } }, "strip": "boolean", @@ -1600,6 +1601,7 @@ }, "securetransport": { "description": "SecureTransport", + "disable": "input.securetransport == 'no' || input.ssl == 'no'", "condition": "config.darwin && (input.openssl == '' || input.openssl == 'no')", "output": [ "publicQtConfig", @@ -1609,6 +1611,7 @@ "openssl": { "description": "OpenSSL", "enable": "input.openssl == 'yes' || input.openssl == 'linked' || input.openssl == 'runtime'", + "disable": "input.openssl == 'no' || input.ssl == 'no'", "condition": "!features.securetransport && tests.openssl", "output": [ { "type": "publicQtConfig", "condition": "!features.openssl-linked" }, -- cgit v1.2.3