autotools: by default, disable x11 on MacOS/iOS

This commit is contained in:
Anonymous Maarten 2022-10-06 23:41:13 +02:00 committed by Anonymous Maarten
parent b18c361b0f
commit 68e20501d6
2 changed files with 18 additions and 4 deletions

11
configure vendored
View File

@ -1713,7 +1713,7 @@ Optional Features:
--enable-libdecor-shared --enable-libdecor-shared
dynamically load libdecor [default=yes] dynamically load libdecor [default=yes]
--enable-video-rpi use Raspberry Pi 2/3 video driver [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-x11-shared dynamically load X11 support [default=maybe]
--enable-video-x11-xcursor --enable-video-x11-xcursor
enable X11 Xcursor support [default=yes] enable X11 Xcursor support [default=yes]
@ -23478,9 +23478,16 @@ if test ${enable_video_x11+y}
then : then :
enableval=$enable_video_x11; enableval=$enable_video_x11;
else $as_nop else $as_nop
enable_video_x11=yes
enable_video_x11=yes
case "$host" in
*-*-darwin*|*-ios-*)
enable_video_x11=no
;;
esac
fi fi
if test x$enable_video = xyes -a x$enable_video_x11 = xyes; then if test x$enable_video = xyes -a x$enable_video_x11 = xyes; then
case "$host" in case "$host" in
*-*-darwin*) *-*-darwin*)

View File

@ -1849,8 +1849,15 @@ dnl Find the X11 include and library directories
CheckX11() CheckX11()
{ {
AC_ARG_ENABLE(video-x11, AC_ARG_ENABLE(video-x11,
[AS_HELP_STRING([--enable-video-x11], [use X11 video driver [default=yes]])], [AS_HELP_STRING([--enable-video-x11], [use X11 video driver [default=maybe]])],
, enable_video_x11=yes) ,[
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 if test x$enable_video = xyes -a x$enable_video_x11 = xyes; then
case "$host" in case "$host" in
*-*-darwin*) *-*-darwin*)