--- libelwix/configure.in 2024/01/22 15:14:11 1.64.2.4 +++ libelwix/configure.in 2024/10/12 16:08:18 1.73 @@ -1,8 +1,8 @@ # # $Author: misho $ -# $Id: configure.in,v 1.64.2.4 2024/01/22 15:14:11 misho Exp $ +# $Id: configure.in,v 1.73 2024/10/12 16:08:18 misho Exp $ # -AC_INIT(libelwix, 5.8, misho@elwix.org) +AC_INIT(libelwix, 6.2, misho@elwix.org) AC_CONFIG_SRCDIR([src/elwix.c]) AC_CONFIG_HEADERS([inc/config.h]) @@ -20,8 +20,14 @@ AC_CANONICAL_TARGET AC_CHECK_TOOL(MKDEP, mkdep, ../mkdep) AC_SUBST(MKDEP) -CFLAGS="-Wall -O2 -fPIC ${CFLAGS}" -LDFLAGS="${LDFLAGS}" +if test "${ac_cv_env_CFLAGS_set}" != "set"; then + CFLAGS="-Wall -O2" +else + CFLAGS="${ac_cv_env_CFLAGS_value}" +fi +if test "${ac_cv_env_LDFLAGS_set}" = "set"; then + LDFLAGS="${ac_cv_env_LDFLAGS_value}" +fi AC_CHECK_LIB([pthread], [pthread_mutex_init]) @@ -46,7 +52,7 @@ AC_ARG_ENABLE(debug, CFLAGS="-g ${CFLAGS}" ;; *) - AC_DEFINE(NDEBUG, 1, [Build w/o assert() support]) + AC_DEFINE(NDEBUG,, [Build w/o assert() support]) ;; esac ],) AC_MSG_RESULT($DEBUG) @@ -67,6 +73,21 @@ AC_ARG_WITH(memmgr, esac ], AC_DEFINE(MEMMGR, ELWIX_MPOOL, [ELWIX memory manager])) AC_MSG_RESULT($MEMMGR) +MPOOL_MEM_ZERO=no +AC_MSG_CHECKING(MPoll zeroing allocated memory) +AC_ARG_ENABLE(mpool-mem-zero, + [ --enable-mpool-mem-zero MPool zeroing allocated memory], + [ case "$enableval" in + yes) + AC_DEFINE(MPOOL_MEM_ZERO,, [MPool zeroing memory]) + MPOOL_MEM_ZERO=yes + ;; + *) + MPOOL_MEM_ZERO=no + ;; + esac ],) +AC_MSG_RESULT($MPOOL_MEM_ZERO) + PATRICIA=no AC_MSG_CHECKING(Patricia support) AC_ARG_ENABLE(patricia, @@ -95,8 +116,18 @@ AC_ARG_ENABLE(pelco, esac ],) AC_MSG_RESULT($PELCO) +DEBIAN_ARCH=$target_cpu +AS_IF([ test "x$target_cpu" = "xarm6l" -o "x$target_cpu" = "xarm7l" ], DEBIAN_ARCH="armhf") +AS_IF([ test "x$target_cpu" = "xaarch64" ], DEBIAN_ARCH="arm64") +AS_IF([ test "x$target_cpu" = "xi686" ], DEBIAN_ARCH="i386") +AS_IF([ test "x$target_cpu" = "xx86_64" ], DEBIAN_ARCH="amd64") +AC_SUBST(DEBIAN_ARCH) + + AC_CONFIG_FILES([Makefile inc/Makefile lib/Makefile + debian/Makefile + debian/control src/Makefile]) AC_OUTPUT