From 78872375c2f07a176491ce4bebf26108c6604ab5 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 14 Jul 2016 15:25:21 +0200 Subject: [PATCH] unify openssl options with the d-bus ones introduce -openssl-runtime and -openssl [no|yes|linked|runtime] for consistency with the respective dbus options. Change-Id: I061b46b52b3132ead4332b33f7a60d6fe0e73ab9 Reviewed-by: Lars Knoll --- configure.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.json b/configure.json index d2fb8b0175..9f9651924f 100644 --- a/configure.json +++ b/configure.json @@ -106,8 +106,9 @@ "opengl": { "type": "optionalString", "values": [ "no", "yes", "desktop", "es2" ] }, "opengles3": "boolean", "opensource": { "type": "void", "name": "commercial", "value": "no" }, - "openssl": "boolean", + "openssl": { "type": "optionalString", "values": [ "no", "yes", "linked", "runtime" ] }, "openssl-linked": { "type": "void", "name": "openssl", "value": "linked" }, + "openssl-runtime": { "type": "void", "name": "openssl", "value": "runtime" }, "optimized-qmake": { "type": "boolean", "name": "release_tools" }, "optimized-tools": { "type": "boolean", "name": "release_tools" }, "pch": { "type": "boolean", "name": "precompile_header" },