--- mqtt/configure	2012/07/03 12:48:02	1.2.2.1
+++ mqtt/configure	2012/10/11 14:58:45	1.2.2.2
@@ -624,6 +624,7 @@ ac_includes_default="\
 
 ac_header_list=
 ac_subst_vars='LTLIBOBJS
+SQLITE3DIR
 LIBOBJS
 EGREP
 GREP
@@ -694,6 +695,7 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_debug
+with_sqlite3dir
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1320,6 +1322,11 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-debug          Build library with debug information and additional messages
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-sqlite3dir=<dir> Custom SQLite3 install directory
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -3384,8 +3391,8 @@ fi
 
 
 
-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.
@@ -4852,6 +4859,19 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEBUG" >&5
 $as_echo "$DEBUG" >&6; }
+
+SQLITE3DIR="/usr/local"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SQLite3 install directory" >&5
+$as_echo_n "checking SQLite3 install directory... " >&6; }
+
+# Check whether --with-sqlite3dir was given.
+if test "${with_sqlite3dir+set}" = set; then :
+  withval=$with_sqlite3dir;  SQLITE3DIR="$withval"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SQLITE3DIR" >&5
+$as_echo "$SQLITE3DIR" >&6; }
+
 
 ac_config_files="$ac_config_files Makefile bin/Makefile inc/Makefile lib/Makefile src/Makefile"