Commit 4f91d9c8 authored by Glenn Morris's avatar Glenn Morris

Regenerate configure.

parent 51603dab
......@@ -724,6 +724,8 @@ NS_OBJ
NS_SUPPORT
LIB_STANDARD
HAVE_XSERVER
GMALLOC_OBJ
VMLIMIT_OBJ
RSVG_CFLAGS
RSVG_LIBS
GTK_CFLAGS
......@@ -810,6 +812,7 @@ OLDXMENU
LIBXMENU
LIBX_OTHER
OLDXMENU_DEPS
RALLOC_OBJ
CYGWIN_OBJ
PRE_ALLOC_OBJ
POST_ALLOC_OBJ
......@@ -10513,11 +10516,20 @@ $as_echo "$emacs_cv_var___after_morecore_hook" >&6; }
if test $emacs_cv_var___after_morecore_hook = no; then
doug_lea_malloc=no
fi
if test "${system_malloc}" = "yes"; then
GNU_MALLOC=no
GNU_MALLOC_reason="
(The GNU allocators don't work with this system configuration.)"
GMALLOC_OBJ=
VMLIMIT_OBJ=
else
test "$doug_lea_malloc" != "yes" && GMALLOC_OBJ=gmalloc.o
VMLIMIT_OBJ=vm-limit.o
fi
if test "$doug_lea_malloc" = "yes" ; then
if test "$GNU_MALLOC" = yes ; then
GNU_MALLOC_reason="
......@@ -10528,6 +10540,14 @@ cat >>confdefs.h <<\_ACEOF
#define DOUG_LEA_MALLOC 1
_ACEOF
## Use mmap directly for allocating larger buffers.
## FIXME this comes from src/s/{gnu,gnu-linux}.h:
## #ifdef DOUG_LEA_MALLOC; #undef REL_ALLOC; #endif
## Does the AC_FUNC_MMAP test below make this check unecessary?
case "$opsys" in
gnu*) REL_ALLOC=no ;;
esac
fi
if test x"${REL_ALLOC}" = x; then
......@@ -26520,6 +26540,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
fi
if test "${GNU_MALLOC}" = "yes" ; then
cat >>confdefs.h <<\_ACEOF
......@@ -26527,12 +26548,16 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
fi
RALLOC_OBJ=
if test "${REL_ALLOC}" = "yes" ; then
cat >>confdefs.h <<\_ACEOF
#define REL_ALLOC 1
_ACEOF
test "$system_malloc" != "yes" && RALLOC_OBJ=ralloc.o
fi
......@@ -26540,11 +26565,11 @@ if test "$opsys" = "cygwin"; then
CYGWIN_OBJ="sheap.o"
## Cygwin differs because of its unexec().
PRE_ALLOC_OBJ=
POST_ALLOC_OBJ="lastfile.o vm-limit.o"
POST_ALLOC_OBJ=lastfile.o
else
CYGWIN_OBJ=
PRE_ALLOC_OBJ=lastfile.o
POST_ALLOC_OBJ="\$(vmlimitobj)"
POST_ALLOC_OBJ=
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment