--- mqtt/configure	2012/07/03 12:27:19	1.1.2.2
+++ mqtt/configure	2012/07/03 12:34:28	1.1.2.3
@@ -3390,13 +3390,13 @@ LDFLAGS="-L/usr/local/lib ${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 crcFletcher16 in -laitcrc" >&5
+$as_echo_n "checking for crcFletcher16 in -laitcrc... " >&6; }
+if ${ac_cv_lib_aitcrc_crcFletcher16+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-laitcfg  $LIBS"
+LIBS="-laitcrc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3406,42 +3406,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char cfgLoadConfig ();
+char crcFletcher16 ();
 int
 main ()
 {
-return cfgLoadConfig ();
+return crcFletcher16 ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_aitcfg_cfgLoadConfig=yes
+  ac_cv_lib_aitcrc_crcFletcher16=yes
 else
-  ac_cv_lib_aitcfg_cfgLoadConfig=no
+  ac_cv_lib_aitcrc_crcFletcher16=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_aitcrc_crcFletcher16" >&5
+$as_echo "$ac_cv_lib_aitcrc_crcFletcher16" >&6; }
+if test "x$ac_cv_lib_aitcrc_crcFletcher16" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBAITCFG 1
+#define HAVE_LIBAITCRC 1
 _ACEOF
 
-  LIBS="-laitcfg $LIBS"
+  LIBS="-laitcrc $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 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_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-laitcrc  $LIBS"
+LIBS="-laitio  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3451,42 +3451,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char crcFletcher16 ();
+char io_allocVar ();
 int
 main ()
 {
-return crcFletcher16 ();
+return io_allocVar ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_aitcrc_crcFletcher16=yes
+  ac_cv_lib_aitio_io_allocVar=yes
 else
-  ac_cv_lib_aitcrc_crcFletcher16=no
+  ac_cv_lib_aitio_io_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_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_aitio_io_allocVar" >&5
+$as_echo "$ac_cv_lib_aitio_io_allocVar" >&6; }
+if test "x$ac_cv_lib_aitio_io_allocVar" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBAITCRC 1
+#define HAVE_LIBAITIO 1
 _ACEOF
 
-  LIBS="-laitcrc $LIBS"
+  LIBS="-laitio $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 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="-laitio  $LIBS"
+LIBS="-laitcfg  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3496,32 +3496,32 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char io_allocVar ();
+char cfgLoadConfig ();
 int
 main ()
 {
-return io_allocVar ();
+return cfgLoadConfig ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_aitio_io_allocVar=yes
+  ac_cv_lib_aitcfg_cfgLoadConfig=yes
 else
-  ac_cv_lib_aitio_io_allocVar=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_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_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_LIBAITIO 1
+#define HAVE_LIBAITCFG 1
 _ACEOF
 
-  LIBS="-laitio $LIBS"
+  LIBS="-laitcfg $LIBS"
 
 fi
 
@@ -3750,9 +3750,9 @@ _ACEOF
 
 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 "$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
@@ -3766,27 +3766,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char flopen ();
+char openpty ();
 int
 main ()
 {
-return flopen ();
+return openpty ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_util_flopen=yes
+  ac_cv_lib_util_openpty=yes
 else
-  ac_cv_lib_util_flopen=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_util_flopen" >&5
-$as_echo "$ac_cv_lib_util_flopen" >&6; }
-if test "x$ac_cv_lib_util_flopen" = 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_LIBUTIL 1
 _ACEOF