From fb6704f3d60725babb22cdb0caf8530cd36044b2 Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Fri, 20 May 2022 14:27:36 +0200 Subject: [PATCH] macosx: disable --with-x on default configuration When building Qt, we only add and link the X11 library and flags when QT5_HAS_X11 is defined (in automake), which happens when we build Qt5X11Extras. Without this check, if autotools find the X11 library, then it might fail to find the headers (because X_CFLAGS won't be used) or will at least fail to link correct (because -lX11 will be missing from the link command). Since we don't use X11 on MacOSX, disable it by default in the configure script like Qt, so that enabling Qt module locally works correctly. --- extras/package/macosx/configure.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/extras/package/macosx/configure.sh b/extras/package/macosx/configure.sh index 329668a00d1d..7c45417689d9 100755 --- a/extras/package/macosx/configure.sh +++ b/extras/package/macosx/configure.sh @@ -25,6 +25,7 @@ OPTIONS=" --disable-pulse --disable-vnc --with-macosx-version-min=10.11 + --without-x " export CFLAGS -- GitLab