aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-09-14 15:11:53 +0000
committerGerd Moellmann2000-09-14 15:11:53 +0000
commite32fac2a98e6626d42ad4fc2ab900f6f7ddd64be (patch)
tree2b933c0ff94cad867dbd2e60e1c884a90b39a856
parent896160ba9652a0c64ba4db0f6f86e7312b684f13 (diff)
downloademacs-e32fac2a98e6626d42ad4fc2ab900f6f7ddd64be.tar.gz
emacs-e32fac2a98e6626d42ad4fc2ab900f6f7ddd64be.zip
(USE_MMAP_FOR_BUFFERS): Recognize in system
configuration files instead of REL_ALLOC_MMAP. Set REL_ALLOC to `no' if defined. Change result report.
-rw-r--r--configure.in16
1 files changed, 8 insertions, 8 deletions
diff --git a/configure.in b/configure.in
index 1642f230470..d649841b580 100644
--- a/configure.in
+++ b/configure.in
@@ -1228,10 +1228,10 @@ configure___ system_malloc=yes
1228configure___ system_malloc=no 1228configure___ system_malloc=no
1229#endif 1229#endif
1230 1230
1231#ifdef REL_ALLOC_MMAP 1231#ifdef USE_MMAP_FOR_BUFFERS
1232configure___ rel_alloc_mmap=yes 1232configure___ use_mmap_for_buffers=yes
1233#else 1233#else
1234configure___ rel_alloc_mmap=no 1234configure___ use_mmap_for_buffers=no
1235#endif 1235#endif
1236 1236
1237#ifndef C_DEBUG_SWITCH 1237#ifndef C_DEBUG_SWITCH
@@ -1544,13 +1544,13 @@ if test x"${REL_ALLOC}" = x; then
1544 REL_ALLOC=${GNU_MALLOC} 1544 REL_ALLOC=${GNU_MALLOC}
1545fi 1545fi
1546 1546
1547dnl For now, need to use an explicit `#define REL_ALLOC_MMAP 1' in 1547dnl For now, need to use an explicit `#define USE_MMAP_FOR_BUFFERS 1'
1548dnl the system configuration file (s/*.h) to turn the use of mmap 1548in dnl the system configuration file (s/*.h) to turn the use of mmap
1549dnl in the relocating allocator on. 1549dnl in the relocating allocator on.
1550 1550
1551AC_FUNC_MMAP 1551AC_FUNC_MMAP
1552if test $rel_alloc_mmap = yes; then 1552if test $use_mmap_for_buffers = yes; then
1553 REL_ALLOC=yes 1553 REL_ALLOC=no
1554fi 1554fi
1555 1555
1556LIBS="$libsrc_libs $LIBS" 1556LIBS="$libsrc_libs $LIBS"
@@ -2195,7 +2195,7 @@ Configured for \`${canonical}'.
2195 What compiler should emacs be built with? ${CC} ${CFLAGS} 2195 What compiler should emacs be built with? ${CC} ${CFLAGS}
2196 Should Emacs use the GNU version of malloc? ${GNU_MALLOC}${GNU_MALLOC_reason} 2196 Should Emacs use the GNU version of malloc? ${GNU_MALLOC}${GNU_MALLOC_reason}
2197 Should Emacs use a relocating allocator for buffers? ${REL_ALLOC} 2197 Should Emacs use a relocating allocator for buffers? ${REL_ALLOC}
2198 Should Emacs use mmap for the relocating allocator? $rel_alloc_mmap 2198 Should Emacs use mmap(2) for buffer allocation? $use_mmap_for_buffers
2199 What window system should Emacs use? ${window_system} 2199 What window system should Emacs use? ${window_system}
2200 What toolkit should Emacs use? ${USE_X_TOOLKIT}" 2200 What toolkit should Emacs use? ${USE_X_TOOLKIT}"
2201 2201