configure: remove support of --enable-x11 under macOS
This support becomes very difficult with recent macOS versions for the approach used in 1.3 based on undefining __APPLE__. [In contrast, the approach used in 1.4 that doesn't mess with __APPLE__ is still compatible with recent macOS versions].
This commit is contained in:
parent
a4789d66c4
commit
82cc1e4b5f
10
configure.ac
10
configure.ac
@ -70,13 +70,13 @@ dnl FLTK build options to be used in Makefiles (defined in makeinclude)
|
||||
USEMMFILES="No"
|
||||
|
||||
dnl OS-specific pre-tests...
|
||||
dnl host_os_gui equals $host_os unless we target Cygwin or Darwin in combination with X11.
|
||||
dnl host_os_gui equals $host_os unless we target Cygwin in combination with X11.
|
||||
host_os_gui=$host_os
|
||||
case $host_os in
|
||||
cygwin*)
|
||||
# Handle Cygwin option *first*, before all other tests.
|
||||
AC_ARG_ENABLE(cygwin, [ --enable-cygwin use the Cygwin libraries [[default=no]]])
|
||||
AC_ARG_ENABLE(x11, [ --enable-x11 with Cygwin or Mac OS, use X11 [[default=no]]])
|
||||
AC_ARG_ENABLE(x11, [ --enable-x11 with Cygwin, use X11 [[default=no]]])
|
||||
if test x$enable_cygwin = xyes; then
|
||||
# we target Cygwin in combination with X11
|
||||
if test x$enable_x11 = xyes; then
|
||||
@ -84,12 +84,6 @@ case $host_os in
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
darwin*)
|
||||
if test x$enable_x11 = xyes; then
|
||||
host_os_gui="X11"
|
||||
OPTIM="-U__APPLE__ -mmacosx-version-min=10.9 -D_LIBCPP_HAS_THREAD_API_PTHREAD $OPTIM"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
|
||||
Loading…
Reference in New Issue
Block a user