--- libaitcli/configure.in	2011/03/16 17:28:25	1.3.2.1
+++ libaitcli/configure.in	2025/12/17 23:41:04	1.24
@@ -1,27 +1,47 @@
 #
 # $Author: misho $
-# $Id: configure.in,v 1.3.2.1 2011/03/16 17:28:25 misho Exp $
+# $Id: configure.in,v 1.24 2025/12/17 23:41:04 misho Exp $
 #
-AC_INIT(libaitcli, 2.1, misho@openbsd-bg.org)
+AC_INIT(libaitcli, 4.7, misho@elwix.org)
 AC_CONFIG_SRCDIR([src/aitcli.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_INSTALL
+AC_PROG_RANLIB
 
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-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}"
+if test x"${prefix}" = x"NONE"; then
+	prefix="/usr/local"
+fi
+if test x"${exec_prefix}" = x"NONE"; then
+	exec_prefix=${prefix}
+fi
 
+if test "${ac_cv_env_CFLAGS_set}" != "set"; then
+	CFLAGS="-Wall -O2 -I${includedir}"
+else
+	CFLAGS="${ac_cv_env_CFLAGS_value}"
+fi
+if test "${ac_cv_env_LDFLAGS_set}" = "set"; then
+	LDFLAGS="${ac_cv_env_LDFLAGS_value}"
+else
+	LDFLAGS="-L$(eval echo ${libdir})"
+fi
+
+
 # Checks for libraries.
 AC_CHECK_LIB(util, [forkpty])
-AC_CHECK_LIB(aitio, [io_TrimStr])
+AC_CHECK_LIB(elwix, [str_Trim])
 
 # Checks for header files.
 AC_CHECK_HEADERS([stdlib.h string.h sys/ioctl.h termios.h unistd.h libutil.h])
@@ -31,7 +51,7 @@ AC_C_INLINE
 
 # Checks for library functions.
 AC_CHECK_FUNCS([memset strdup strerror])
-AC_CHECK_FUNCS([io_TrimStr])
+AC_CHECK_FUNCS([str_Trim])
 AC_CHECK_FUNCS([forkpty])
 
 DEBUG=no
@@ -45,13 +65,22 @@ AC_ARG_ENABLE(debug,
 				CFLAGS="-g ${CFLAGS}"
 				;;
 			*)
-				AC_DEFINE(NDEBUG,, [Build w/o assert() support])
+				AC_DEFINE(NDEBUG,, [Turn off debug asserts])
 				;;
-		esac ],)
+		esac ], AC_DEFINE(NDEBUG,, [Turn off debug asserts]))
 AC_MSG_RESULT($DEBUG)
 
+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
-                 src/Makefile])
+		inc/Makefile
+		lib/Makefile
+		debian/Makefile
+		debian/control
+		src/Makefile])
 AC_OUTPUT