configure: inline openssl test sources

Change-Id: I47c1c43b5db30cf1d59de9c6c20ca83abef2cf8c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
qt · Dec 19, 2018 · b6cd5fd · b6cd5fd
1 parent 6b39d51
commit b6cd5fd
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 108 deletions.
diff --git a/config.tests/openssl/openssl.cpp b/config.tests/openssl/openssl.cpp
diff --git a/config.tests/openssl/openssl.pro b/config.tests/openssl/openssl.pro
diff --git a/config.tests/unix/openssl11/openssl.cpp b/config.tests/unix/openssl11/openssl.cpp
diff --git a/config.tests/unix/openssl11/openssl.pro b/config.tests/unix/openssl11/openssl.pro
diff --git a/src/network/configure.json b/src/network/configure.json
@@ -57,7 +57,17 @@
         "openssl_headers": {
             "label": "OpenSSL Headers",
             "export": "openssl",
-            "test": "openssl",
+            "test": {
+                "tail": [
+                    "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10000000L",
+                    "#  error OpenSSL >= 1.0.0 is required",
+                    "#endif",
+                    "#if OPENSSL_VERSION_NUMBER-0 >= 0x10002000L && !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES)",
+                    "#  error OpenSSL was reported as >= 1.0.2 but is missing required features, possibly it's libressl which is unsupported",
+                    "#endif"
+                ]
+            },
+            "headers": [ "openssl/ssl.h", "openssl/opensslv.h" ],
             "sources": [
                 {
                     "comment": "placeholder for OPENSSL_PATH",
@@ -67,7 +77,10 @@
         },
         "openssl": {
             "label": "OpenSSL",
-            "test": "openssl",
+            "test": {
+                "inherit": "openssl_headers",
+                "main": "SSL_free(SSL_new(0));"
+            },
             "sources": [
                 { "type": "openssl" },
                 {
@@ -149,7 +162,14 @@
         "openssl11": {
             "label": "OpenSSL 1.1 support",
             "type": "compile",
-            "test": "unix/openssl11",
+            "test": {
+                "include": "openssl/opensslv.h",
+                "tail": [
+                    "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L",
+                    "#  error OpenSSL >= 1.1 is required",
+                    "#endif"
+                ]
+            },
             "use": "openssl"
         },
         "dtls": {