Commit 68e20501d6e5bf9ebba04fd2a159c86a5424c38a
2022-10-06T23:41:13
autotools: by default, disable x11 on MacOS/iOS
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
diff --git a/configure b/configure
index 6a29da2..f3390df 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 61f0104..f8bc77d 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*)