--- mqtt/configure	2012/07/03 12:27:19	1.1.2.2
+++ mqtt/configure	2013/01/18 09:45:34	1.3.2.1
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mqtt 1.2.
+# Generated by GNU Autoconf 2.69 for mqtt 2.0.
 #
 # Report bugs to <misho@elwix.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mqtt'
 PACKAGE_TARNAME='mqtt'
-PACKAGE_VERSION='1.2'
-PACKAGE_STRING='mqtt 1.2'
+PACKAGE_VERSION='2.0'
+PACKAGE_STRING='mqtt 2.0'
 PACKAGE_BUGREPORT='misho@elwix.org'
 PACKAGE_URL=''
 
@@ -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
@@ -1244,7 +1246,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mqtt 1.2 to adapt to many kinds of systems.
+\`configure' configures mqtt 2.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1310,7 +1312,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mqtt 1.2:";;
+     short | recursive ) echo "Configuration of mqtt 2.0:";;
    esac
   cat <<\_ACEOF
 
@@ -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
@@ -1396,7 +1403,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mqtt configure 1.2
+mqtt configure 2.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1819,7 +1826,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mqtt $as_me 1.2, which was
+It was created by mqtt $as_me 2.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3384,19 +3391,19 @@ 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.
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cfgLoadConfig in -laitcfg" >&5
-$as_echo_n "checking for cfgLoadConfig in -laitcfg... " >&6; }
-if ${ac_cv_lib_aitcfg_cfgLoadConfig+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
+$as_echo_n "checking for openpty in -lutil... " >&6; }
+if ${ac_cv_lib_util_openpty+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-laitcfg  $LIBS"
+LIBS="-lutil  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3406,42 +3413,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char cfgLoadConfig ();
+char openpty ();
 int
 main ()
 {
-return cfgLoadConfig ();
+return openpty ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_aitcfg_cfgLoadConfig=yes
+  ac_cv_lib_util_openpty=yes
 else
-  ac_cv_lib_aitcfg_cfgLoadConfig=no
+  ac_cv_lib_util_openpty=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aitcfg_cfgLoadConfig" >&5
-$as_echo "$ac_cv_lib_aitcfg_cfgLoadConfig" >&6; }
-if test "x$ac_cv_lib_aitcfg_cfgLoadConfig" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
+$as_echo "$ac_cv_lib_util_openpty" >&6; }
+if test "x$ac_cv_lib_util_openpty" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBAITCFG 1
+#define HAVE_LIBUTIL 1
 _ACEOF
 
-  LIBS="-laitcfg $LIBS"
+  LIBS="-lutil $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for crcFletcher16 in -laitcrc" >&5
-$as_echo_n "checking for crcFletcher16 in -laitcrc... " >&6; }
-if ${ac_cv_lib_aitcrc_crcFletcher16+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BF_set_key in -lcrypto" >&5
+$as_echo_n "checking for BF_set_key in -lcrypto... " >&6; }
+if ${ac_cv_lib_crypto_BF_set_key+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-laitcrc  $LIBS"
+LIBS="-lcrypto  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3451,42 +3458,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char crcFletcher16 ();
+char BF_set_key ();
 int
 main ()
 {
-return crcFletcher16 ();
+return BF_set_key ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_aitcrc_crcFletcher16=yes
+  ac_cv_lib_crypto_BF_set_key=yes
 else
-  ac_cv_lib_aitcrc_crcFletcher16=no
+  ac_cv_lib_crypto_BF_set_key=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aitcrc_crcFletcher16" >&5
-$as_echo "$ac_cv_lib_aitcrc_crcFletcher16" >&6; }
-if test "x$ac_cv_lib_aitcrc_crcFletcher16" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_BF_set_key" >&5
+$as_echo "$ac_cv_lib_crypto_BF_set_key" >&6; }
+if test "x$ac_cv_lib_crypto_BF_set_key" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBAITCRC 1
+#define HAVE_LIBCRYPTO 1
 _ACEOF
 
-  LIBS="-laitcrc $LIBS"
+  LIBS="-lcrypto $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for io_allocVar in -laitio" >&5
-$as_echo_n "checking for io_allocVar in -laitio... " >&6; }
-if ${ac_cv_lib_aitio_io_allocVar+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+if ${ac_cv_lib_pthread_pthread_create+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-laitio  $LIBS"
+LIBS="-lpthread  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3496,42 +3503,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char io_allocVar ();
+char pthread_create ();
 int
 main ()
 {
-return io_allocVar ();
+return pthread_create ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_aitio_io_allocVar=yes
+  ac_cv_lib_pthread_pthread_create=yes
 else
-  ac_cv_lib_aitio_io_allocVar=no
+  ac_cv_lib_pthread_pthread_create=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aitio_io_allocVar" >&5
-$as_echo "$ac_cv_lib_aitio_io_allocVar" >&6; }
-if test "x$ac_cv_lib_aitio_io_allocVar" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBAITIO 1
+#define HAVE_LIBPTHREAD 1
 _ACEOF
 
-  LIBS="-laitio $LIBS"
+  LIBS="-lpthread $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mqtt_msgAlloc in -laitmqtt" >&5
-$as_echo_n "checking for mqtt_msgAlloc in -laitmqtt... " >&6; }
-if ${ac_cv_lib_aitmqtt_mqtt_msgAlloc+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_reset in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_reset in -lsqlite3... " >&6; }
+if ${ac_cv_lib_sqlite3_sqlite3_reset+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-laitmqtt  $LIBS"
+LIBS="-lsqlite3  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3541,42 +3548,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char mqtt_msgAlloc ();
+char sqlite3_reset ();
 int
 main ()
 {
-return mqtt_msgAlloc ();
+return sqlite3_reset ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_aitmqtt_mqtt_msgAlloc=yes
+  ac_cv_lib_sqlite3_sqlite3_reset=yes
 else
-  ac_cv_lib_aitmqtt_mqtt_msgAlloc=no
+  ac_cv_lib_sqlite3_sqlite3_reset=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aitmqtt_mqtt_msgAlloc" >&5
-$as_echo "$ac_cv_lib_aitmqtt_mqtt_msgAlloc" >&6; }
-if test "x$ac_cv_lib_aitmqtt_mqtt_msgAlloc" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_reset" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_reset" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_reset" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBAITMQTT 1
+#define HAVE_LIBSQLITE3 1
 _ACEOF
 
-  LIBS="-laitmqtt $LIBS"
+  LIBS="-lsqlite3 $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for schedRun in -laitsched" >&5
-$as_echo_n "checking for schedRun in -laitsched... " >&6; }
-if ${ac_cv_lib_aitsched_schedRun+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ait_allocVar in -lelwix" >&5
+$as_echo_n "checking for ait_allocVar in -lelwix... " >&6; }
+if ${ac_cv_lib_elwix_ait_allocVar+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-laitsched  $LIBS"
+LIBS="-lelwix  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3586,42 +3593,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char schedRun ();
+char ait_allocVar ();
 int
 main ()
 {
-return schedRun ();
+return ait_allocVar ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_aitsched_schedRun=yes
+  ac_cv_lib_elwix_ait_allocVar=yes
 else
-  ac_cv_lib_aitsched_schedRun=no
+  ac_cv_lib_elwix_ait_allocVar=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aitsched_schedRun" >&5
-$as_echo "$ac_cv_lib_aitsched_schedRun" >&6; }
-if test "x$ac_cv_lib_aitsched_schedRun" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elwix_ait_allocVar" >&5
+$as_echo "$ac_cv_lib_elwix_ait_allocVar" >&6; }
+if test "x$ac_cv_lib_elwix_ait_allocVar" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBAITSCHED 1
+#define HAVE_LIBELWIX 1
 _ACEOF
 
-  LIBS="-laitsched $LIBS"
+  LIBS="-lelwix $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BF_set_key in -lcrypto" >&5
-$as_echo_n "checking for BF_set_key in -lcrypto... " >&6; }
-if ${ac_cv_lib_crypto_BF_set_key+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cfgLoadConfig in -laitcfg" >&5
+$as_echo_n "checking for cfgLoadConfig in -laitcfg... " >&6; }
+if ${ac_cv_lib_aitcfg_cfgLoadConfig+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypto  $LIBS"
+LIBS="-laitcfg  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3631,42 +3638,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char BF_set_key ();
+char cfgLoadConfig ();
 int
 main ()
 {
-return BF_set_key ();
+return cfgLoadConfig ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_crypto_BF_set_key=yes
+  ac_cv_lib_aitcfg_cfgLoadConfig=yes
 else
-  ac_cv_lib_crypto_BF_set_key=no
+  ac_cv_lib_aitcfg_cfgLoadConfig=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_BF_set_key" >&5
-$as_echo "$ac_cv_lib_crypto_BF_set_key" >&6; }
-if test "x$ac_cv_lib_crypto_BF_set_key" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aitcfg_cfgLoadConfig" >&5
+$as_echo "$ac_cv_lib_aitcfg_cfgLoadConfig" >&6; }
+if test "x$ac_cv_lib_aitcfg_cfgLoadConfig" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCRYPTO 1
+#define HAVE_LIBAITCFG 1
 _ACEOF
 
-  LIBS="-lcrypto $LIBS"
+  LIBS="-laitcfg $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_create+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mqtt_msgAlloc in -laitmqtt" >&5
+$as_echo_n "checking for mqtt_msgAlloc in -laitmqtt... " >&6; }
+if ${ac_cv_lib_aitmqtt_mqtt_msgAlloc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
+LIBS="-laitmqtt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3676,42 +3683,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char pthread_create ();
+char mqtt_msgAlloc ();
 int
 main ()
 {
-return pthread_create ();
+return mqtt_msgAlloc ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pthread_pthread_create=yes
+  ac_cv_lib_aitmqtt_mqtt_msgAlloc=yes
 else
-  ac_cv_lib_pthread_pthread_create=no
+  ac_cv_lib_aitmqtt_mqtt_msgAlloc=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aitmqtt_mqtt_msgAlloc" >&5
+$as_echo "$ac_cv_lib_aitmqtt_mqtt_msgAlloc" >&6; }
+if test "x$ac_cv_lib_aitmqtt_mqtt_msgAlloc" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPTHREAD 1
+#define HAVE_LIBAITMQTT 1
 _ACEOF
 
-  LIBS="-lpthread $LIBS"
+  LIBS="-laitmqtt $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_reset in -lsqlite3" >&5
-$as_echo_n "checking for sqlite3_reset in -lsqlite3... " >&6; }
-if ${ac_cv_lib_sqlite3_sqlite3_reset+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for schedRun in -laitsched" >&5
+$as_echo_n "checking for schedRun in -laitsched... " >&6; }
+if ${ac_cv_lib_aitsched_schedRun+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsqlite3  $LIBS"
+LIBS="-laitsched  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3721,81 +3728,36 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char sqlite3_reset ();
+char schedRun ();
 int
 main ()
 {
-return sqlite3_reset ();
+return schedRun ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_sqlite3_sqlite3_reset=yes
+  ac_cv_lib_aitsched_schedRun=yes
 else
-  ac_cv_lib_sqlite3_sqlite3_reset=no
+  ac_cv_lib_aitsched_schedRun=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_reset" >&5
-$as_echo "$ac_cv_lib_sqlite3_sqlite3_reset" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_reset" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aitsched_schedRun" >&5
+$as_echo "$ac_cv_lib_aitsched_schedRun" >&6; }
+if test "x$ac_cv_lib_aitsched_schedRun" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSQLITE3 1
+#define HAVE_LIBAITSCHED 1
 _ACEOF
 
-  LIBS="-lsqlite3 $LIBS"
+  LIBS="-laitsched $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for flopen in -lutil" >&5
-$as_echo_n "checking for flopen in -lutil... " >&6; }
-if ${ac_cv_lib_util_flopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lutil  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char flopen ();
-int
-main ()
-{
-return flopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_util_flopen=yes
-else
-  ac_cv_lib_util_flopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_flopen" >&5
-$as_echo "$ac_cv_lib_util_flopen" >&6; }
-if test "x$ac_cv_lib_util_flopen" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBUTIL 1
-_ACEOF
-
-  LIBS="-lutil $LIBS"
-
-fi
-
-
 # Checks for header files.
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -4853,6 +4815,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"
 
 cat >confcache <<\_ACEOF
@@ -5361,7 +5336,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mqtt $as_me 1.2, which was
+This file was extended by mqtt $as_me 2.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5423,7 +5398,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-mqtt config.status 1.2
+mqtt config.status 2.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"