--- libelwix/configure	2015/01/19 23:22:10	1.26.2.1
+++ libelwix/configure	2015/06/24 23:28:29	1.26.2.2
@@ -693,6 +693,7 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_debug
+with_memmgr
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1319,6 +1320,11 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-debug          Build library with debug information and additional messages
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-memmgr=<mm>      Memory manager for ELWIX (elwix|system)
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -4003,6 +4009,35 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEBUG" >&5
 $as_echo "$DEBUG" >&6; }
+
+MEMMGR="elwix"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Memory management" >&5
+$as_echo_n "checking Memory management... " >&6; }
+
+# Check whether --with-memmgr was given.
+if test "${with_memmgr+set}" = set; then :
+  withval=$with_memmgr;  case "$withval" in
+		sys|system)
+			MEMMGR="system"
+
+$as_echo "#define MEMMGR ELWIX_SYSM" >>confdefs.h
+
+			;;
+		*)
+			MEMMGR="elwix"
+
+$as_echo "#define MEMMGR ELWIX_MPOOL" >>confdefs.h
+
+			;;
+	  esac
+else
+
+$as_echo "#define MEMMGR ELWIX_MPOOL" >>confdefs.h
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MEMMGR" >&5
+$as_echo "$MEMMGR" >&6; }
 
 ac_config_files="$ac_config_files Makefile inc/Makefile lib/Makefile src/Makefile"