--- mqtt/configure.in	2012/07/03 12:40:10	1.1.2.4
+++ mqtt/configure.in	2017/10/08 22:50:40	1.4.2.1
@@ -1,11 +1,14 @@
 #
 # $Author: misho $
-# $Id: configure.in,v 1.1.2.4 2012/07/03 12:40:10 misho Exp $
+# $Id: configure.in,v 1.4.2.1 2017/10/08 22:50:40 misho Exp $
 #
-AC_INIT(mqtt, 1.2, misho@elwix.org)
+AC_INIT(mqtt, 2.1, misho@elwix.org)
 AC_CONFIG_HEADERS(inc/config.h)
 AC_CONFIG_SRCDIR(src/mqttd.c)
 
+ac_cv_func_malloc_0_nonnull="yes"
+ac_cv_func_realloc_0_nonnull="yes"
+
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_RANLIB
@@ -17,8 +20,8 @@ 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}"
+CFLAGS="-Wall -O2 -fPIC ${CFLAGS}"
+LDFLAGS="${LDFLAGS}"
 
 
 # Checks for libraries.
@@ -26,8 +29,7 @@ AC_CHECK_LIB([util], openpty)
 AC_CHECK_LIB([crypto], BF_set_key)
 AC_CHECK_LIB([pthread], pthread_create)
 AC_CHECK_LIB([sqlite3], sqlite3_reset)
-AC_CHECK_LIB([aitcrc], crcFletcher16)
-AC_CHECK_LIB([aitio], io_allocVar)
+AC_CHECK_LIB([elwix], ait_allocVar)
 AC_CHECK_LIB([aitcfg], cfgLoadConfig)
 AC_CHECK_LIB([aitmqtt], mqtt_msgAlloc)
 AC_CHECK_LIB([aitsched], schedRun)
@@ -60,6 +62,14 @@ AC_ARG_ENABLE(debug,
 				;;
 		esac ], AC_DEFINE(NDEBUG,, [Turn off debug asserts]))
 AC_MSG_RESULT($DEBUG)
+
+SQLITE3DIR="/usr/local"
+AC_MSG_CHECKING(SQLite3 install directory)
+AC_ARG_WITH(sqlite3dir, 
+	[  --with-sqlite3dir=<dir> Custom SQLite3 install directory ], 
+	[ SQLITE3DIR="$withval" ], )
+AC_MSG_RESULT($SQLITE3DIR)
+AC_SUBST(SQLITE3DIR)
 
 AC_CONFIG_FILES([Makefile
                  bin/Makefile