--- ../unix/configure.orig	2009-01-05 14:01:40.024365003 +0100
+++ ../unix/configure	2009-01-05 14:03:08.152289554 +0100
@@ -1409,13 +1409,9 @@
   "no" )
 	TCL_INCLUDE_DIR="# no Tcl headers"
   ;;
-  *","* )
-	TCL_INCLUDE_DIR="`echo $with_tcl | sed -e 's/,.*$//'`"
-	TCL_LIB_DIR="`echo $with_tcl | sed -e 's/^.*,//'`"
-  ;;
   * )
     TCL_INCLUDE_DIR="$with_tcl"
-    TCL_LIB_DIR="$with_tcl/../lib"
+    TCL_LIB_DIR="${TCL_LIBDIR}"
   ;;
 esac
 
@@ -1482,7 +1478,7 @@
 if test $SHARED_BUILD = 1; then
   SHLIB_FLAGS="-shared"
   SHLIB_CFLAGS="-fPIC -DUSE_TCL_STUBS"
-  SHLIB_LD="g++ -shared"
+  SHLIB_LD="$CXX -shared"
 else
   SHLIB_FLAGS=""
   SHLIB_CFLAGS=""