--- embedtools/configure.in	2011/06/08 09:08:43	1.1.2.1
+++ embedtools/configure.in	2013/05/22 11:57:33	1.4.2.3
@@ -1,7 +1,14 @@
-AC_INIT(embedtools, 1.0, misho@elwix.org)
+#
+# $Author: misho $
+# $Id: configure.in,v 1.4.2.3 2013/05/22 11:57:33 misho Exp $
+#
+AC_INIT(embedtools, 2.0, misho@elwix.org)
 AC_CONFIG_SRCDIR([src/cfexec.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
@@ -12,20 +19,26 @@ AC_CANONICAL_TARGET
 AC_CHECK_TOOL(MKDEP, mkdep, no)
 AC_SUBST(MKDEP)
 
-CFLAGS="-Wall -O2 -fPIC -I/usr/local/include ${CFLAGS}"
-LDFLAGS="-L/usr/local/lib ${LDFLAGS}"
+OS=$(uname)
+AC_SUBST(OS)
+MACHINE=${MACHINE:-i386}
+AC_SUBST(MACHINE)
 
+CFLAGS="-Wall -O2 -fPIC -g -DINET6 ${CFLAGS}"
+LDFLAGS="${LDFLAGS}"
+
 # Checks for libraries.
+AC_CHECK_LIB([elwix], [str_Trim])
 AC_CHECK_LIB([aitcfg], [LoadConfig])
-AC_CHECK_LIB([aitcrc], [crcAdler])
-AC_CHECK_LIB([aitio], [io_TrimStr])
 AC_CHECK_LIB([aitsync], [syncDelta])
+AC_CHECK_LIB([aitwww], [www_XMLGet])
 AC_CHECK_LIB([axl], [axl_init])
 AC_CHECK_LIB([crypto], [MD5_Init])
 AC_CHECK_LIB([util], [openpty])
 
 # Checks for header files.
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h paths.h stdlib.h string.h sys/ioctl.h sys/mount.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h utmp.h utmpx.h])
+AC_CHECK_HEADERS([libutil.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
@@ -45,7 +58,7 @@ AC_FUNC_MALLOC
 AC_FUNC_MMAP
 AC_FUNC_REALLOC
 AC_FUNC_WAIT3
-AC_CHECK_FUNCS([alarm bzero dup2 endpwent getcwd gethostbyname gethostname inet_ntoa isascii memmove memset munmap select socket strcasecmp strchr strdup strerror strrchr strspn strstr strtol strtoul])
+AC_CHECK_FUNCS([alarm bzero dup2 endpwent getcwd gethostbyname gethostname inet_ntoa isascii memmove memset munmap select socket strcasecmp strchr strdup strerror strrchr strspn strstr strtol strtoul strtonum])
 AC_CHECK_FUNCS([kldnext kldfirstmod modfnext modstat kldload])
 
 DEBUG=no