--- libelwix/configure.in	2024/08/14 15:37:35	1.69
+++ libelwix/configure.in	2024/08/14 16:05:42	1.70
@@ -1,6 +1,6 @@
 #
 # $Author: misho $
-# $Id: configure.in,v 1.69 2024/08/14 15:37:35 misho Exp $
+# $Id: configure.in,v 1.70 2024/08/14 16:05:42 misho Exp $
 #
 AC_INIT(libelwix, 6.0, misho@elwix.org)
 AC_CONFIG_SRCDIR([src/elwix.c])
@@ -67,6 +67,7 @@ AC_ARG_WITH(memmgr,
 	  esac ], AC_DEFINE(MEMMGR, ELWIX_MPOOL, [ELWIX memory manager]))
 AC_MSG_RESULT($MEMMGR)
 
+<<<<<<< configure.in
 MPOOL_MEM_ZERO=yes
 AC_MSG_CHECKING(MPoll zeroing allocated memory)
 AC_ARG_ENABLE(mpool-mem-zero, 
@@ -82,6 +83,23 @@ AC_ARG_ENABLE(mpool-mem-zero, 
 		  esac ], [ AC_DEFINE(MPOOL_MEM_ZERO,, [MPool zeroing memory]) ])
 AC_MSG_RESULT($MPOOL_MEM_ZERO)
 
+=======
+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)
+
+>>>>>>> 1.68.2.3
 PATRICIA=no
 AC_MSG_CHECKING(Patricia support)
 AC_ARG_ENABLE(patricia,