--- rrdtool-1.4.7/configure.ac.orig	2012-01-24 11:08:48.000000000 +0100
+++ rrdtool-1.4.7/configure.ac	2012-11-27 12:07:01.000000000 +0100
@@ -840,7 +840,7 @@
   withval=""
   AC_ARG_WITH(tcllib,[  --with-tcllib=DIR       location of the tclConfig.sh])
   enable_tcl=no
-  for dir in $withval /usr/lib /usr/lib64 /usr/local/lib /usr/lib/tcl8.4 /usr/lib/tcl8.3 ; do
+  for dir in $withval /usr/lib /usr/lib64 /usr/local/lib /usr/lib/tcl8.5 /usr/lib/tcl8.4 /usr/lib/tcl8.3 ; do
     AC_MSG_CHECKING(for tclConfig.sh in $dir)
     if test -f "$dir/tclConfig.sh" ; then
     	tcl_config=$dir/tclConfig.sh
@@ -862,7 +862,7 @@
 	fi
   fi
   AC_ARG_ENABLE(tcl-site,AS_HELP_STRING([--enable-tcl-site],[install the tcl extension in the tcl tree]),
-  [],[enable_tcl_site=yes])
+  [enable_tcl_site="$enable_tcl"],[enable_tcl_site=yes])
 
 fi