--- libelwix/configure.in	2013/05/30 09:09:09	1.4.2.1
+++ libelwix/configure.in	2015/06/24 23:37:16	1.27
@@ -1,8 +1,8 @@
 #
 # $Author: misho $
-# $Id: configure.in,v 1.4.2.1 2013/05/30 09:09:09 misho Exp $
+# $Id: configure.in,v 1.27 2015/06/24 23:37:16 misho Exp $
 #
-AC_INIT(libelwix, 1.4, misho@elwix.org)
+AC_INIT(libelwix, 3.6, misho@elwix.org)
 AC_CONFIG_SRCDIR([src/elwix.c])
 AC_CONFIG_HEADERS([inc/config.h])
 
@@ -20,8 +20,8 @@ AC_CANONICAL_TARGET
 AC_CHECK_TOOL(MKDEP, mkdep, no)
 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])
 
@@ -50,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=<mm>      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