--- micq-0.5.4.1/configure.ac.orig	2007-06-10 21:32:25.000000000 +0200
+++ micq-0.5.4.1/configure.ac	2007-06-11 07:21:05.000000000 +0200
@@ -165,17 +165,17 @@
   LIBS=""
   LIBTCL_LIBS=""
   if test "x$ac_arg_use_autopackage" = xyes; then
-    AC_CHECK_HEADERS([tcl8.4/tcl.h tcl.h], [ac_use_tcl=yes
+    AC_CHECK_HEADERS([tcl8.5/tcl.h tcl8.4/tcl.h tcl.h], [ac_use_tcl=yes
                                             break])
     if test "x$ac_use_tcl" = "xyes"; then
-      AC_SEARCH_LIBS([Tcl_CreateInterp], [tcl8.4], [ac_use_tcl=yes
+      AC_SEARCH_LIBS([Tcl_CreateInterp], [tcl8.5 tcl8.4], [ac_use_tcl=yes
                                                     LIBTCL_LIBS=$LIBS], [ac_use_tcl=no], [$temp_LIBS])
     fi
   else
-    AC_CHECK_HEADERS([tcl8.4/tcl.h tcl8.3/tcl.h tcl.h], [ac_use_tcl=yes
+    AC_CHECK_HEADERS([tcl8.5/tcl.h tcl8.4/tcl.h tcl8.3/tcl.h tcl.h], [ac_use_tcl=yes
                                                          break])
     if test "x$ac_use_tcl" = "xyes"; then
-      AC_SEARCH_LIBS([Tcl_CreateInterp], [tcl8.4 tcl8.3], [ac_use_tcl=yes
+      AC_SEARCH_LIBS([Tcl_CreateInterp], [tcl8.5 tcl8.4 tcl8.3], [ac_use_tcl=yes
                                                            LIBTCL_LIBS=$LIBS], [ac_use_tcl=no], [$temp_LIBS])
     fi
   fi
@@ -591,12 +591,12 @@
 fi
 
 if test "x$ac_use_autopackage" = xyes; then
-    LIBS='`'"$RELAYTOOL --relay 'tcl8.4 tcl8.3 gnutls gcrypt gpg-error gloox otr' $LIBS"'`'
-    LIBGCRYPT_LIBS='`'"$RELAYTOOL --relay 'tcl8.4 tcl8.3 gnutls gcrypt gpg-error gloox otr' $LIBGCRYPT_LIBS"'`'
-    LIBGNUTLS_LIBS='`'"$RELAYTOOL --relay 'tcl8.4 tcl8.3 gnutls gcrypt gpg-error gloox otr' $LIBGNUTLS_LIBS"'`'
-    LIBOTR_LIBS='`'"$RELAYTOOL --relay 'tcl8.4 tcl8.3 gnutls gcrypt gpg-error gloox otr' $LIBOTR_LIBS"'`'
-    LIBTCL_LIBS='`'"$RELAYTOOL --relay 'tcl8.4 tcl8.3 gnutls gcrypt gpg-error gloox otr' $LIBTCL_LIBS"'`'
-    XMPP_LIBS='`'"$RELAYTOOL --relay 'tcl8.4 tcl8.3 gnutls gcrypt gpg-error gloox otr' $XMPP_LIBS"'`'
+    LIBS='`'"$RELAYTOOL --relay 'tcl8.5 tcl8.4 tcl8.3 gnutls gcrypt gpg-error gloox otr' $LIBS"'`'
+    LIBGCRYPT_LIBS='`'"$RELAYTOOL --relay 'tcl8.5 tcl8.4 tcl8.3 gnutls gcrypt gpg-error gloox otr' $LIBGCRYPT_LIBS"'`'
+    LIBGNUTLS_LIBS='`'"$RELAYTOOL --relay 'tcl8.5 tcl8.4 tcl8.3 gnutls gcrypt gpg-error gloox otr' $LIBGNUTLS_LIBS"'`'
+    LIBOTR_LIBS='`'"$RELAYTOOL --relay 'tcl8.5 tcl8.4 tcl8.3 gnutls gcrypt gpg-error gloox otr' $LIBOTR_LIBS"'`'
+    LIBTCL_LIBS='`'"$RELAYTOOL --relay 'tcl8.5 tcl8.4 tcl8.3 gnutls gcrypt gpg-error gloox otr' $LIBTCL_LIBS"'`'
+    XMPP_LIBS='`'"$RELAYTOOL --relay 'tcl8.5 tcl8.4 tcl8.3 gnutls gcrypt gpg-error gloox otr' $XMPP_LIBS"'`'
 fi
 
 AC_MSG_CHECKING([whether to enable XMPP chat network (BETA)])