--- libaitmqtt/configure.in	2012/06/29 13:55:39	1.4.2.1
+++ libaitmqtt/configure.in	2022/09/14 14:32:48	1.8.2.4
@@ -1,26 +1,27 @@
 #
 # $Author: misho $
-# $Id: configure.in,v 1.4.2.1 2012/06/29 13:55:39 misho Exp $
+# $Id: configure.in,v 1.8.2.4 2022/09/14 14:32:48 misho Exp $
 #
-AC_INIT(libaitmqtt, 1.4, misho@elwix.org)
+AC_INIT(libaitmqtt, 1.8, misho@elwix.org)
 AC_CONFIG_SRCDIR([src/aitmqtt.c])
 AC_CONFIG_HEADERS([inc/config.h])
 
+ac_cv_func_malloc_0_nonnull="yes"
+ac_cv_func_realloc_0_nonnull="yes"
+
 # Checks for programs.
 AC_PROG_CC
-AC_PROG_RANLIB
 AC_PROG_INSTALL
+AC_PROG_RANLIB
 
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-AC_CHECK_TOOL(AR, ar, no)
-AC_SUBST(AR)
-AC_CHECK_TOOL(MKDEP, mkdep, no)
+AC_CHECK_TOOL(MKDEP, mkdep, ../mkdep)
 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}"
 
 
 # Checks for libraries.
@@ -34,7 +35,7 @@ AC_C_INLINE
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([memset strdup strerror strtol])
+AC_CHECK_FUNCS([memset strdup strerror strtol strlcpy strlcat])
 
 DEBUG=no
 AC_MSG_CHECKING(Debug Build)
@@ -52,8 +53,24 @@ AC_ARG_ENABLE(debug,
 		esac ], AC_DEFINE(NDEBUG,, [Turn off debug asserts]))
 AC_MSG_RESULT($DEBUG)
 
+ELWIX=no
+AC_MSG_CHECKING(With libelwix Build)
+AC_ARG_WITH(elwix,
+	[  --with-elwix          Build library with libelwix memory managemant],
+	[ ELWIX=$withval
+		case "$withval" in
+			yes)
+				AC_DEFINE(__ELWIX,, [Build libraries with libelwix memory managemant])
+				CFLAGS="-g ${CFLAGS}"
+				LIBS="-lelwix"
+				;;
+			*)
+				;;
+		esac ],)
+AC_MSG_RESULT($ELWIX)
+
 AC_CONFIG_FILES([Makefile
                  inc/Makefile
                  lib/Makefile
                  src/Makefile])
-AC_OUTPUT
+AC_OUTPUT()