--- libelwix/configure.in	2018/03/07 12:31:05	1.38.2.1
+++ libelwix/configure.in	2024/08/14 16:05:42	1.70
@@ -1,8 +1,8 @@
 #
 # $Author: misho $
-# $Id: configure.in,v 1.38.2.1 2018/03/07 12:31:05 misho Exp $
+# $Id: configure.in,v 1.70 2024/08/14 16:05:42 misho Exp $
 #
-AC_INIT(libelwix, 4.9, misho@elwix.org)
+AC_INIT(libelwix, 6.0, misho@elwix.org)
 AC_CONFIG_SRCDIR([src/elwix.c])
 AC_CONFIG_HEADERS([inc/config.h])
 
@@ -34,7 +34,7 @@ AC_C_INLINE
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([memset regcomp strchr strerror link_addr])
+AC_CHECK_FUNCS([memset regcomp strchr strerror link_addr strlcpy strlcat])
 
 DEBUG=no
 AC_MSG_CHECKING(Debug Build)
@@ -67,8 +67,79 @@ 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, 
+	      [  --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_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, 
+	      [  --enable-patricia       Patricia support for ELWIX], 
+	      [ case "$enableval" in 
+		 	yes)
+				AC_DEFINE(PATRICIA_SUPPORT,, [Patricia support])
+				PATRICIA=yes
+				;;
+			*)
+				;;
+		  esac ],)
+AC_MSG_RESULT($PATRICIA)
+
+PELCO=no
+AC_MSG_CHECKING(Pelco support)
+AC_ARG_ENABLE(pelco, 
+	      [  --enable-pelco          Pelco support for ELWIX], 
+	      [ case "$enableval" in 
+		 	yes)
+				AC_DEFINE(PELCO_SUPPORT,, [Pelco support])
+				PELCO=yes
+				;;
+			*)
+				;;
+		  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