X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/ceafd592b7c084e0857902f0dd4132db97b2abf7..dee9951d5f32dee38cf29861acdb4a347931e147:/configure.in diff --git a/configure.in b/configure.in index 0c5f092..76144b3 100644 --- a/configure.in +++ b/configure.in @@ -67,7 +67,7 @@ AC_HEADER_TIME AC_STRUCT_TM dnl Would rather not bail on headers, BSD has alot of the functions elsewhere. -Jedi -AC_CHECK_HEADERS(fcntl.h malloc.h netdb.h netinet/in.h sys/resource.h sys/timeb.h sys/times.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h unistd.h getopt.h memory.h regex.h arpa/inet.h sys/mman.h sys/stat.h dirent.h,,) +AC_CHECK_HEADERS(fcntl.h tgmath.h malloc.h netdb.h netinet/in.h sys/resource.h sys/timeb.h sys/times.h sys/param.h sys/socket.h sys/time.h sys/types.h sys/wait.h unistd.h getopt.h memory.h regex.h arpa/inet.h sys/mman.h sys/stat.h dirent.h,,) dnl Cygwin does not have d_type in struct dirent. We use stat() as a fallback. AC_CHECK_MEMBER([struct dirent.d_type], @@ -153,7 +153,7 @@ dnl Optional features. AC_MSG_CHECKING(which malloc to use) AC_ARG_WITH(malloc, [ --with-malloc=type Enables use of a special malloc library; one of: - system (the default), boehm-gc, dmalloc, mpatrol, srvx, slab], + system (the default), boehm-gc, dmalloc, mpatrol, x3, slab], [], [withval="system"]) if test "x$withval" = "xsystem" ; then @@ -177,10 +177,10 @@ elif test "x$withval" = "xboehm-gc" ; then AC_CHECK_LIB(dl, dlopen, , AC_MSG_ERROR([libdl library is missing. boehm-gc build will fail.])) AC_CHECK_LIB(gc, GC_gcollect, , AC_MSG_ERROR([Boehm GC library is missing. boehm-gc build will fail.])) AC_DEFINE(WITH_MALLOC_BOEHM_GC, 1, [Define if using the Boehm GC to garbage collect and check memory leaks]) -elif test "x$withval" = "xsrvx" ; then - AC_MSG_RESULT(srvx) - AC_DEFINE(WITH_MALLOC_SRVX, 1, [Define if using the srvx internal debug allocator]) - MODULE_OBJS="$MODULE_OBJS alloc-srvx.\$(OBJEXT)" +elif test "x$withval" = "xx3" ; then + AC_MSG_RESULT(x3) + AC_DEFINE(WITH_MALLOC_X3, 1, [Define if using the x3 internal debug allocator]) + MODULE_OBJS="$MODULE_OBJS alloc-x3.\$(OBJEXT)" elif test "x$withval" = "xslab" ; then AC_MSG_RESULT(slab) AC_DEFINE(WITH_MALLOC_SLAB, 1, [Define if using the slab internal debug allocator])