diff options
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/configure.json b/configure.json index d25517c33..19a32a17c 100644 --- a/configure.json +++ b/configure.json @@ -12,7 +12,6 @@ "ffmpeg": { "type": "enum", "name": "system-ffmpeg", "values": { "system": "yes", "qt": "no" } }, "opus": { "type": "enum", "name": "system-opus", "values": { "system": "yes", "qt": "no" } }, "webp": { "type": "enum", "name": "system-webp", "values": { "system": "yes", "qt": "no" } }, - "nss-certificate-handling": "boolean", "pepper-plugins": "boolean", "printing-and-pdf": "boolean", "proprietary-codecs": "boolean", @@ -61,7 +60,7 @@ ] }, "nss": { - "label": "NSS", + "label": "nss", "sources": [ { "type": "pkgConfig", "args": "nss" } ] @@ -182,12 +181,9 @@ "autoDetect": "!features.embedded", "output": [ "privateFeature" ] }, - "nss-certificate-handling": { - "label": "NSS certificate handling", - "purpose": "Use NSS to handle certificates instead of BoringSSL. Recommended on Linux.", - "section": "WebEngine", - "condition": "config.unix && !config.darwin", - "autoDetect": "libs.nss", + "system-nss": { + "label": "nss", + "condition": "config.unix && !config.darwin && libs.nss", "output": [ "privateFeature" ] }, "system-webp": { @@ -277,11 +273,6 @@ "condition": "config.unix" }, { - "type": "feature", - "args": "nss-certificate-handling", - "condition": "config.unix && !config.darwin" - }, - { "section": "System libraries", "condition": "config.unix", "entries": [ |