From cbd195201a8c7cab39e94e9b65d7b00bbbd35dd8 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 22 Oct 2018 19:18:35 -0600 Subject: [PATCH] cs: disable use of ncurses when building Chez Scheme RacketCS doesn't currently access the Chez Scheme expeditor, and avoiding curses make the build work in a more mininal environment. --- racket/src/cs/c/configure | 6 +++++- racket/src/cs/c/configure.ac | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/racket/src/cs/c/configure b/racket/src/cs/c/configure index 342ebc495e..d2deea8f68 100755 --- a/racket/src/cs/c/configure +++ b/racket/src/cs/c/configure @@ -3635,6 +3635,7 @@ fi MACH_HOST_CPU="${host_cpu}" extra_scheme_config_args= +disable_curses_arg=--disable-curses case "$host_os" in solaris2*) @@ -3764,6 +3765,9 @@ case "$host_os" in # -pthread is not needed and triggers a warning use_flag_pthread=no + + # ncurses.h is always available + disable_curses_arg="" ;; nto-qnx*) MACH_OS=qnx @@ -3823,7 +3827,7 @@ if test "${enable_mach}" != "" ; then MACH="${enable_mach}" fi -SCHEME_CONFIG_ARGS="--machine=${MACH} ${thread_config_arg} ${extra_scheme_config_args}" +SCHEME_CONFIG_ARGS="--machine=${MACH} ${thread_config_arg} --disable-x11 ${disable_curses_arg} ${extra_scheme_config_args}" if test "${enable_compress}" = "yes" ; then COMPRESS_COMP="--compress" diff --git a/racket/src/cs/c/configure.ac b/racket/src/cs/c/configure.ac index ee50617a74..141b6fa48f 100644 --- a/racket/src/cs/c/configure.ac +++ b/racket/src/cs/c/configure.ac @@ -126,6 +126,7 @@ AC_CHECK_LIB(dl, dlopen) MACH_HOST_CPU="${host_cpu}" extra_scheme_config_args= +disable_curses_arg=--disable-curses case "$host_os" in solaris2*) @@ -201,6 +202,9 @@ case "$host_os" in # -pthread is not needed and triggers a warning use_flag_pthread=no + + # ncurses.h is always available + disable_curses_arg="" ;; nto-qnx*) MACH_OS=qnx @@ -260,7 +264,7 @@ if test "${enable_mach}" != "" ; then MACH="${enable_mach}" fi -SCHEME_CONFIG_ARGS="--machine=${MACH} ${thread_config_arg} ${extra_scheme_config_args}" +SCHEME_CONFIG_ARGS="--machine=${MACH} ${thread_config_arg} --disable-x11 ${disable_curses_arg} ${extra_scheme_config_args}" if test "${enable_compress}" = "yes" ; then COMPRESS_COMP="--compress"