--- libelwix/configure	2013/01/17 10:07:27	1.1.1.1.2.1
+++ libelwix/configure	2015/06/24 23:28:29	1.26.2.2
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libelwix 1.1.
+# Generated by GNU Autoconf 2.69 for libelwix 3.6.
 #
 # Report bugs to <misho@elwix.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libelwix'
 PACKAGE_TARNAME='libelwix'
-PACKAGE_VERSION='1.1'
-PACKAGE_STRING='libelwix 1.1'
+PACKAGE_VERSION='3.6'
+PACKAGE_STRING='libelwix 3.6'
 PACKAGE_BUGREPORT='misho@elwix.org'
 PACKAGE_URL=''
 
@@ -693,6 +693,7 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_debug
+with_memmgr
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1243,7 +1244,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libelwix 1.1 to adapt to many kinds of systems.
+\`configure' configures libelwix 3.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1309,7 +1310,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libelwix 1.1:";;
+     short | recursive ) echo "Configuration of libelwix 3.6:";;
    esac
   cat <<\_ACEOF
 
@@ -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
@@ -1395,7 +1401,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libelwix configure 1.1
+libelwix configure 3.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1764,7 +1770,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libelwix $as_me 1.1, which was
+It was created by libelwix $as_me 3.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2116,6 +2122,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_config_headers="$ac_config_headers inc/config.h"
 
 
+ac_cv_func_malloc_0_nonnull="yes"
+ac_cv_func_realloc_0_nonnull="yes"
+
 # Checks for programs.
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3326,8 +3335,8 @@ fi
 
 
 
-CFLAGS="-Wall -O2 -fPIC -I/usr/local/include ${CFLAGS}"
-LDFLAGS="-L/usr/local/lib ${LDFLAGS}"
+CFLAGS="-Wall -O2 -fPIC ${CFLAGS}"
+LDFLAGS="${LDFLAGS}"
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lpthread" >&5
@@ -4001,6 +4010,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"
 
 cat >confcache <<\_ACEOF
@@ -4509,7 +4547,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libelwix $as_me 1.1, which was
+This file was extended by libelwix $as_me 3.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4571,7 +4609,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libelwix config.status 1.1
+libelwix config.status 3.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"