From cb66553ad54ef8c2038cbd8d0b89125c47922d5e Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Thu, 29 Jun 2017 21:19:33 +0300 Subject: [PATCH] Fix configure --disable-munmap handling (fix commits d564f15, bfd8345) * configure.ac (USE_MUNMAP, MUNMAP_THRESHOLD): Do not define if enable_munmap is "no" (or a blank value). * configure.ac [with_checksums=yes]: Do not report AC_MSG_ERROR if enable_munmap is "no". --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7db6fbb7..79ce0807 100644 --- a/configure.ac +++ b/configure.ac @@ -882,7 +882,7 @@ AC_ARG_ENABLE(munmap, [AC_HELP_STRING([--enable-munmap=N], [return page to the os if empty for N collections])], MUNMAP_THRESHOLD=$enableval) -if test "${enable_munmap}" != ""; then +if test x$enable_munmap != x -a x$enable_munmap != xno; then AC_DEFINE([USE_MMAP], 1, [Define to use mmap instead of sbrk to expand the heap.]) case "$host" in @@ -915,7 +915,8 @@ AC_ARG_WITH([checksums], substantial performance cost; use only for debugging of the incremental collector])]) if test x$with_checksums = xyes; then - if test x$enable_munmap != x -o x$THREADS != xnone; then + if test x$enable_munmap != x -a x$enable_munmap != xno \ + -o x$THREADS != xnone; then AC_MSG_ERROR([CHECKSUMS not compatible with USE_MUNMAP or threads]) fi AC_DEFINE([CHECKSUMS], 1, -- 2.40.0