--- libaitcfg/configure.in	2024/03/18 08:50:33	1.31
+++ libaitcfg/configure.in	2024/08/19 19:33:19	1.31.2.2
@@ -1,8 +1,8 @@
 #
 # $Author: misho $
-# $Id: configure.in,v 1.31 2024/03/18 08:50:33 misho Exp $
+# $Id: configure.in,v 1.31.2.2 2024/08/19 19:33:19 misho Exp $
 #
-AC_INIT(libaitcfg, 9.4, misho@elwix.org)
+AC_INIT(libaitcfg, 9.5, misho@elwix.org)
 AC_CONFIG_SRCDIR([src/aitcfg.c])
 AC_CONFIG_HEADERS([inc/config.h])
 
@@ -20,14 +20,25 @@ AC_CANONICAL_TARGET
 AC_CHECK_TOOL(MKDEP, mkdep, ../mkdep)
 AC_SUBST(MKDEP)
 
-CFLAGS="-Wall -O2 -fPIC ${CFLAGS}"
-LDFLAGS="${LDFLAGS}"
+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${libdir}"
+fi
 
+
 # Checks for libraries.
 AC_CHECK_LIB([pthread], [pthread_mutex_lock])
 AC_CHECK_LIB([elwix], [str_Trim])
 
 # Checks for header files.
+AC_CHECK_HEADERS([stdint.h stdlib.h string.h unistd.h])
+AC_CHECK_HEADERS([bsd/string.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -36,7 +47,7 @@ AC_C_INLINE
 # Checks for library functions.
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([bzero memmove memset strchr strspn])
+AC_CHECK_FUNCS([memmove memset strchr strspn])
 
 DEBUG=no
 AC_MSG_CHECKING(Debug Build)
@@ -49,14 +60,22 @@ AC_ARG_ENABLE(debug,
 				CFLAGS="-g ${CFLAGS}"
 				;;
 			*)
-				AC_DEFINE(NDEBUG,, [No debug, remove asserts])
+				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
 		debian/Makefile
+		debian/control
 		src/Makefile])
 AC_OUTPUT