--- libelwix/configure.in 2013/01/17 10:05:35 1.1.1.1 +++ libelwix/configure.in 2019/01/22 16:18:46 1.48 @@ -1,11 +1,14 @@ # # $Author: misho $ -# $Id: configure.in,v 1.1.1.1 2013/01/17 10:05:35 misho Exp $ +# $Id: configure.in,v 1.48 2019/01/22 16:18:46 misho Exp $ # -AC_INIT(libelwix, 1.0, misho@elwix.org) +AC_INIT(libelwix, 4.18, misho@elwix.org) AC_CONFIG_SRCDIR([src/elwix.c]) AC_CONFIG_HEADERS([inc/config.h]) +ac_cv_func_malloc_0_nonnull="yes" +ac_cv_func_realloc_0_nonnull="yes" + # Checks for programs. AC_PROG_CC AC_PROG_INSTALL @@ -14,11 +17,11 @@ AC_PROG_RANLIB AC_CANONICAL_HOST AC_CANONICAL_TARGET -AC_CHECK_TOOL(MKDEP, mkdep, no) +AC_CHECK_TOOL(MKDEP, mkdep, ../mkdep) AC_SUBST(MKDEP) -CFLAGS="-Wall -O2 -fPIC -I/usr/local/include ${CFLAGS}" -LDFLAGS="-L/usr/local/lib ${LDFLAGS}" +CFLAGS="-Wall -O2 -fPIC ${CFLAGS}" +LDFLAGS="${LDFLAGS}" AC_CHECK_LIB([pthread], [pthread_mutex_init]) @@ -31,7 +34,7 @@ AC_C_INLINE # Checks for library functions. AC_FUNC_MALLOC AC_FUNC_REALLOC -AC_CHECK_FUNCS([memset regcomp strchr strerror]) +AC_CHECK_FUNCS([memset regcomp strchr strerror link_addr]) DEBUG=no AC_MSG_CHECKING(Debug Build) @@ -47,6 +50,22 @@ AC_ARG_ENABLE(debug, ;; esac ],) AC_MSG_RESULT($DEBUG) + +MEMMGR="elwix" +AC_MSG_CHECKING(Memory management) +AC_ARG_WITH(memmgr, + [ --with-memmgr= Memory manager for ELWIX (elwix|system)], + [ case "$withval" in + sys|system) + MEMMGR="system" + AC_DEFINE(MEMMGR, ELWIX_SYSM, [ELWIX memory manager]) + ;; + *) + MEMMGR="elwix" + AC_DEFINE(MEMMGR, ELWIX_MPOOL, [ELWIX memory manager]) + ;; + esac ], AC_DEFINE(MEMMGR, ELWIX_MPOOL, [ELWIX memory manager])) +AC_MSG_RESULT($MEMMGR) AC_CONFIG_FILES([Makefile inc/Makefile