Chez Scheme: always disable X11 support on Mac OS

This commit is contained in:
Matthew Flatt 2021-01-22 09:35:59 -07:00
parent 9c8d7b3ebf
commit be42b9a24a
5 changed files with 4 additions and 12 deletions

View File

@ -16,7 +16,6 @@
m ?= a6osx m ?= a6osx
Cpu ?= X86_64 Cpu ?= X86_64
mdinclude = -I/opt/X11/include/
o = o o = o
mdsrc ?= i3le.c mdsrc ?= i3le.c
mdobj ?= i3le.o mdobj ?= i3le.o

View File

@ -16,7 +16,6 @@
m ?= arm64osx m ?= arm64osx
Cpu ?= AARCH64 Cpu ?= AARCH64
mdinclude = -I/opt/X11/include/
o = o o = o
mdsrc ?= arm32le.c mdsrc ?= arm32le.c
mdobj ?= arm32le.o mdobj ?= arm32le.o

View File

@ -16,7 +16,6 @@
m ?= i3osx m ?= i3osx
Cpu ?= I386 Cpu ?= I386
mdinclude = -I/opt/X11/include/
o = o o = o
mdsrc ?= i3le.c mdsrc ?= i3le.c
mdobj ?= i3le.o mdobj ?= i3le.o

View File

@ -352,7 +352,10 @@ typedef int tputsputcchar;
#define LOCKF #define LOCKF
#define DIRMARKERP(c) ((c) == '/') #define DIRMARKERP(c) ((c) == '/')
#ifndef DISABLE_X11 #ifndef DISABLE_X11
#define LIBX11 "/usr/X11R6/lib/libX11.dylib" # define DISABLE_X11
#endif
#ifndef DISABLE_X11
# define LIBX11 "/usr/X11R6/lib/libX11.dylib"
#endif #endif
#define _DARWIN_USE_64_BIT_INODE #define _DARWIN_USE_64_BIT_INODE
#define SECATIME(sb) (sb).st_atimespec.tv_sec #define SECATIME(sb) (sb).st_atimespec.tv_sec

View File

@ -407,14 +407,6 @@ if [ "$installman" = "" ] ; then
installman=$installprefix/$installmansuffix installman=$installprefix/$installmansuffix
fi fi
if [ "$disablex11" = "no" ] ; then
if [ $m = a6osx ] || [ $m = ta6osx ] ; then
if [ ! -d /opt/X11/include/ ] ; then
disablex11=yes
fi
fi
fi
if [ "$help" = "yes" ]; then if [ "$help" = "yes" ]; then
echo "Purpose:" echo "Purpose:"
echo " $0 determines the machine type and constructs a custom Makefile" echo " $0 determines the machine type and constructs a custom Makefile"