--- mqtt/configure.in	2012/07/03 12:34:28	1.1.2.3
+++ mqtt/configure.in	2012/10/11 14:58:46	1.2.2.2
@@ -1,8 +1,8 @@
 #
 # $Author: misho $
-# $Id: configure.in,v 1.1.2.3 2012/07/03 12:34:28 misho Exp $
+# $Id: configure.in,v 1.2.2.2 2012/10/11 14:58:46 misho Exp $
 #
-AC_INIT(mqtt, 1.2, misho@elwix.org)
+AC_INIT(mqtt, 1.3, misho@elwix.org)
 AC_CONFIG_HEADERS(inc/config.h)
 AC_CONFIG_SRCDIR(src/mqttd.c)
 
@@ -17,20 +17,20 @@ 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.
+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([aitcfg], cfgLoadConfig)
 AC_CHECK_LIB([aitmqtt], mqtt_msgAlloc)
 AC_CHECK_LIB([aitsched], schedRun)
-AC_CHECK_LIB([crypto], BF_set_key)
-AC_CHECK_LIB([pthread], pthread_create)
-AC_CHECK_LIB([sqlite3], sqlite3_reset)
-AC_CHECK_LIB([util], openpty)
 
 # Checks for header files.
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/param.h sys/socket.h syslog.h unistd.h])
@@ -60,6 +60,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