From 5e2367aaa5137f27c722cd7f8474696b0fbaa099 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Tue, 11 Oct 2016 20:39:11 +0200
Subject: use regular configure mechanism for openssl library references

don't attempt to hand-craft a library export any more. instead, use the
configure system's built-in mechanism, and refer to it via QMAKE_USE.
this also allows us to rely on transitive dependencies in the autotest.

as a side effect, this makes the openssl-linked feature imply the
openssl one.

Change-Id: I5dd209b63bc8fbbc62852f6ffc472d4452ea2e68
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/network/configure.json | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'src/network/configure.json')

diff --git a/src/network/configure.json b/src/network/configure.json
index 1e08aa7c49..c9077c8968 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -46,13 +46,24 @@
                 "-lproxy"
             ]
         },
+        "openssl_headers": {
+            "label": "OpenSSL Headers",
+            "export": "openssl",
+            "test": "unix/openssl",
+            "sources": [
+                {
+                    "comment": "placeholder for OPENSSL_PATH",
+                    "libs": ""
+                }
+            ]
+        },
         "openssl": {
-            "label": "OpenSSL Libraries",
-            "export": "",
+            "label": "OpenSSL",
+            "test": "unix/openssl",
             "sources": [
                 { "type": "openssl" },
                 {
-                    "comment": "placeholder for OPENSSL_LIBS{,_{DEBUG,RELEASE}}",
+                    "comment": "placeholder for OPENSSL_{PATH,LIBS{,_{DEBUG,RELEASE}}}",
                     "libs": "",
                     "builds": {
                         "debug": "",
@@ -92,11 +103,6 @@
             "test": "unix/ipv6ifname",
             "use": "network"
         },
-        "openssl": {
-            "label": "OpenSSL",
-            "type": "compile",
-            "test": "unix/openssl"
-        },
         "sctp": {
             "label": "SCTP support",
             "type": "compile",
@@ -138,7 +144,7 @@
             "enable": "input.openssl == 'yes' || input.openssl == 'linked' || input.openssl == 'runtime'",
             "disable": "input.openssl == 'no' || input.ssl == 'no'",
             "autoDetect": "!config.winrt",
-            "condition": "!features.securetransport && tests.openssl",
+            "condition": "!features.securetransport && (features.openssl-linked || libs.openssl_headers)",
             "output": [
                 "privateFeature",
                 { "type": "publicQtConfig", "condition": "!features.openssl-linked" },
@@ -149,14 +155,9 @@
             "label": "  Qt directly linked to OpenSSL",
             "enable": "input.openssl == 'linked'",
             "disable": "input.openssl != 'linked'",
-            "condition": "features.openssl && libs.openssl",
+            "condition": "!features.securetransport && libs.openssl",
             "output": [
                 "privateFeature",
-                { "type": "varAssign", "name": "OPENSSL_LIBS", "value": "libs.openssl.libs", "eval": "true" },
-                { "type": "varAssign", "name": "OPENSSL_LIBS_DEBUG", "value": "libs.openssl.builds.debug.libs",
-                  "eval": "true", "condition": "config.win32" },
-                { "type": "varAssign", "name": "OPENSSL_LIBS_RELEASE", "value": "libs.openssl.builds.release.libs",
-                  "eval": "true", "condition": "config.win32" },
                 { "type": "define", "name": "QT_LINKED_OPENSSL" }
             ]
         },
-- 
cgit v1.2.3