From 68e20501d6e5bf9ebba04fd2a159c86a5424c38a Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Thu, 6 Oct 2022 23:41:13 +0200 Subject: [PATCH] autotools: by default, disable x11 on MacOS/iOS --- configure | 11 +++++++++-- configure.ac | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 6a29da267..f3390df52 100755 --- a/configure +++ b/configure @@ -1713,7 +1713,7 @@ Optional Features: --enable-libdecor-shared dynamically load libdecor [default=yes] --enable-video-rpi use Raspberry Pi 2/3 video driver [default=yes] - --enable-video-x11 use X11 video driver [default=yes] + --enable-video-x11 use X11 video driver [default=maybe] --enable-x11-shared dynamically load X11 support [default=maybe] --enable-video-x11-xcursor enable X11 Xcursor support [default=yes] @@ -23478,9 +23478,16 @@ if test ${enable_video_x11+y} then : enableval=$enable_video_x11; else $as_nop - enable_video_x11=yes + + enable_video_x11=yes + case "$host" in + *-*-darwin*|*-ios-*) + enable_video_x11=no + ;; + esac fi + if test x$enable_video = xyes -a x$enable_video_x11 = xyes; then case "$host" in *-*-darwin*) diff --git a/configure.ac b/configure.ac index 61f01047d..f8bc77d21 100644 --- a/configure.ac +++ b/configure.ac @@ -1849,8 +1849,15 @@ dnl Find the X11 include and library directories CheckX11() { AC_ARG_ENABLE(video-x11, -[AS_HELP_STRING([--enable-video-x11], [use X11 video driver [default=yes]])], - , enable_video_x11=yes) +[AS_HELP_STRING([--enable-video-x11], [use X11 video driver [default=maybe]])], + ,[ + enable_video_x11=yes + case "$host" in + *-*-darwin*|*-ios-*) + enable_video_x11=no + ;; + esac]) + if test x$enable_video = xyes -a x$enable_video_x11 = xyes; then case "$host" in *-*-darwin*)