1 files changed, 23 insertions, 4 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json
index a7f08f2cc0..0f71f7a98f 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -1,7 +1,8 @@
 {
     "module": "gui",
     "depends": [
-        "core"
+        "core",
+        "network"
     ],
     "testDir": "../../config.tests",
 
@@ -206,7 +207,7 @@
             "test": {
                 "include": "harfbuzz/hb.h",
                 "tail": [
-                    "#if !HB_VERSION_ATLEAST(0, 9, 42)",
+                    "#if !HB_VERSION_ATLEAST(1, 6, 0)",
                     "#  error This version of harfbuzz is too old.",
                     "#endif"
                 ],
@@ -955,7 +956,8 @@
         },
         "fontconfig": {
             "label": "Fontconfig",
-            "condition": "!config.win32 && !config.darwin && features.system-freetype && libs.fontconfig",
+            "autoDetect": "!config.darwin",
+            "condition": "!config.win32 && features.system-freetype && libs.fontconfig",
             "output": [ "privateFeature", "feature" ]
         },
         "gbm": {
@@ -1022,7 +1024,10 @@
         "vnc": {
             "label": "VNC",
             "section": "Platform plugins",
-            "condition": "config.unix && !config.android && !config.darwin && features.regularexpression",
+            "condition": [
+                "config.unix && !config.android && !config.darwin",
+                "features.regularexpression && features.network"
+            ],
             "output": [ "privateFeature" ]
         },
         "mirclient": {
@@ -1226,6 +1231,12 @@
             "condition": "libs.tslib",
             "output": [ "privateFeature" ]
         },
+        "tuiotouch": {
+            "label": "TuioTouch",
+            "purpose": "Provides the TuioTouch input plugin.",
+            "condition": "features.network && features.udpsocket",
+            "output": [ "privateFeature" ]
+        },
         "xcb": {
             "label": "XCB",
             "section": "Platform plugins",
@@ -1316,6 +1327,7 @@
         },
         "xlib": {
             "label": "XLib",
+            "autoDetect": "!config.darwin || features.xcb",
             "condition": "tests.xlib",
             "output": [ "privateFeature" ]
         },
@@ -1539,6 +1551,13 @@ XKB configuration data. This is required for keyboard input support."
         },
         {
             "type": "note",
+            "condition": "features.xcb && config.darwin",
+            "message": "XCB support on macOS is minimal and untested. Some features will
+not work properly or at all (e.g. OpenGL, desktop services or accessibility),
+or may depend on your system and XQuartz setup."
+        },
+        {
+            "type": "note",
             "condition": "features.accessibility && features.xcb && !features.accessibility-atspi-bridge",
             "message": "Disabling X11 Accessibility Bridge: D-Bus or AT-SPI is missing."
         },