diff options
| -rw-r--r-- | config_help.txt | 4 | ||||
| -rw-r--r-- | configure.json | 23 |
2 files changed, 20 insertions, 7 deletions
diff --git a/config_help.txt b/config_help.txt index 944e520118..85277afd3b 100644 --- a/config_help.txt +++ b/config_help.txt @@ -175,7 +175,9 @@ Core options: -doubleconversion .... Select used double conversion library [system/qt/no] No implies use of sscanf_l and snprintf_l (imprecise). -glib ................ Enable Glib support [auto] - -iconv ............... Enable iconv(3) support [auto] + -eventfd ............. Enable eventfd support + -inotify ............. Enable inotify support + -iconv ............... Enable iconv(3) support [posix/sun/gnu/no] -icu ................. Enable ICU support [auto] -pps ................. Enable PPS support [auto] (QNX only) -pcre ................ Select used libpcre3 [system/qt] 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": { |