From 615616b0699d98cfb9f4eeb67e005e3226398097 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Thu, 14 Jul 2016 12:46:44 +0200
Subject: add some unix-specific options understood by configure.exe

it's really a bit weird that the windows configure has more options to
configure unix features than the unix one, even if some are just
workarounds for missing auto-detection.

unlike in configure.exe itself, -posix-iconv is now also understood for
symmetry with -gnu-iconv and -sun-iconv.

Change-Id: Ic15376e5822e43b998bd17f02c11e5dd0567dc2b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 configure.json | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index 167caff646..0c811e2275 100644
--- a/configure.json
+++ b/configure.json
@@ -65,6 +65,7 @@
             "egl": "boolean",
             "eglfs": "boolean",
             "evdev": "boolean",
+            "eventfd": "boolean",
             "fontconfig": "boolean",
             "force-asserts": { "type": "boolean", "name": "force_asserts" },
             "force-debug-info": { "type": "boolean", "name": "force_debug_info" },
@@ -83,9 +84,10 @@
             "harfbuzz": { "type": "enum", "values": [ "no", "qt", "system" ] },
             "headersclean": "boolean",
             "host-option": "string",
-            "iconv": "boolean",
+            "iconv": { "type": "enum", "values": [ "no", "yes", "posix", "sun", "gnu" ] },
             "icu": "boolean",
             "imf": { "type": "boolean", "name": "qqnx_imf" },
+            "inotify": "boolean",
             "journald": "boolean",
             "lgmon": "boolean",
             "libinput": "boolean",
@@ -116,6 +118,7 @@
             "pkg-config": "boolean",
             "platform": "string",
             "pps": { "type": "boolean", "name": "qqnx_pps" },
+            "posix-ipc": { "type": "boolean", "name": "ipc_posix" },
             "profile": "boolean",
             "psql_config": "string",
             "pulseaudio": "boolean",
@@ -1730,19 +1733,27 @@
         },
         "iconv": {
             "description": "iconv",
-            "condition": "!config.win32 && (tests.posix-iconv || features.sun-libiconv || features.gnu-libiconv)",
+            "condition": "features.posix-libiconv || features.sun-libiconv || features.gnu-libiconv",
             "output": [ "feature" ]
         },
+        "posix-libiconv": {
+            "description": "POSIX iconv",
+            "enable": "input.iconv == 'posix'",
+            "disable": "input.iconv == 'sun' || input.iconv == 'gnu' || input.iconv == 'no'",
+            "condition": "!config.win32 && tests.posix-iconv"
+        },
         "sun-libiconv": {
             "description": "SUN iconv",
-            "disable": "input.iconv == 'no'",
-            "condition": "!config.win32 && !tests.posix-iconv && tests.sun-iconv",
+            "enable": "input.iconv == 'sun'",
+            "disable": "input.iconv == 'posix' || input.iconv == 'gnu' || input.iconv == 'no'",
+            "condition": "!config.win32 && !features.posix-libiconv && tests.sun-iconv",
             "output": [ "publicQtConfig" ]
         },
         "gnu-libiconv": {
             "description": "GNU iconv",
-            "disable": "input.iconv == 'no'",
-            "condition": "!config.win32 && !tests.posix-iconv && !tests.sun-iconv && tests.gnu-iconv",
+            "enable": "input.iconv == 'gnu'",
+            "disable": "input.iconv == 'posix' || input.iconv == 'sun' || input.iconv == 'no'",
+            "condition": "!config.win32 && !features.posix-libiconv && !features.sun-libiconv && tests.gnu-iconv",
             "output": [ "publicQtConfig" ]
         },
         "freetype": {
-- 
cgit v1.2.3