diff options
Diffstat (limited to 'src/network/configure.json')
| -rw-r--r-- | src/network/configure.json | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/src/network/configure.json b/src/network/configure.json index f80f38f143..0ecee2c572 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -98,6 +98,30 @@ "condition": "!config.msvc" } ] + }, + "gssapi": { + "label": "KRB5 GSSAPI Support", + "test": { + "head": [ + "#if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))", + "# include <TargetConditionals.h>", + "# if defined(TARGET_OS_MAC) && TARGET_OS_MAC", + "# include <GSS/GSS.h>", + "# endif", + "#else", + "# include <gssapi/gssapi.h>", + "#endif" + ], + "main": [ + "gss_ctx_id_t ctx;", + "gss_context_time(nullptr, ctx, nullptr);" + ] + }, + "sources": [ + { "libs": "-framework GSS", "condition": "config.darwin" }, + { "type": "pkgConfig", "args": "krb5-gssapi" }, + "-lgssapi_krb5" + ] } }, @@ -200,15 +224,6 @@ }, "use": "openssl" }, - "gssapi": { - "label": "KRB5 GSSAPI support", - "type": "compile", - "test": { - "include": [ "gssapi/gssapi.h" ], - "main": ["gss_ctx_id_t ctx;"], - "qmake": "LIBS += -lgssapi_krb5" - } - }, "netlistmgr": { "label": "Network List Manager", "type": "compile", @@ -385,7 +400,11 @@ "purpose": "Provides bearer management for the network stack.", "section": "Networking", "condition": "features.thread && features.library && features.networkinterface && features.properties", - "output": [ "publicFeature", "feature" ] + "output": [ + "publicFeature", + "feature", + { "type": "define", "negative": true, "name": "QT_NO_BEARERMANAGEMENT" } + ] }, "localserver": { "label": "QLocalServer", @@ -404,7 +423,7 @@ "label": "GSSAPI", "purpose": "Enable SPNEGO authentication through GSSAPI", "section": "Networking", - "condition": "!config.win32 && tests.gssapi", + "condition": "!config.win32 && libs.gssapi", "output": [ "publicFeature", "feature" ] }, "sspi": { |