--- saods9.orig/htmlwidget/configure	2006-05-01 19:47:09.000000000 +0200
+++ saods9/htmlwidget/configure	2008-03-08 16:36:40.000000000 +0100
@@ -1052,11 +1052,11 @@
   echo "$ac_t""$BUILD_TCLSH" 1>&6
 else
   if test "$with_tcl" != ""; then
-    if test -x "$with_tcl/$tclsubdir/tclsh"; then
-      BUILD_TCLSH=$with_tcl/$tclsubdir/tclsh
+    if test -x "$with_tcl/tclsh"; then
+      BUILD_TCLSH=$with_tcl/tclsh
     else
-      if test -x "$with_tcl/$tclsubdir/tclsh8.0"; then
-        BUILD_TCLSH=$with_tcl/$tclsubdir/tclsh8.0
+      if test -x "$with_tcl/tclsh8.0"; then
+        BUILD_TCLSH=$with_tcl/tclsh8.0
       fi
     fi
   fi
@@ -1137,7 +1137,7 @@
 if test "$enable_shared" = "yes"; then
   ok=0
   if test "$with_tcl" != ""; then
-    tclconf=$with_tcl/unix/tclConfig.sh
+    tclconf=$with_tcl/tclConfig.sh
     
 ac_safe=`echo "$tclconf" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $tclconf""... $ac_c" 1>&6
@@ -1494,7 +1494,7 @@
   TARGET_TCL_LIBS="$config_TARGET_TCL_LIBS"
 else
   if test "$with_tcl" != ""; then
-    extra=`echo $with_tcl/$tclsubdir/libtcl8*.a`
+    extra=`echo -ltcl`
   fi
   CC=$TARGET_CC
   echo $ac_n "checking for sin""... $ac_c" 1>&6
--- saods9.orig/htmlwidget/src/htmlcmd.c	2002-06-20 22:19:33.000000000 +0100
+++ saods9/htmlwidget/src/htmlcmd.c	2008-11-05 12:31:11.000000000 +0000
@@ -23,6 +23,7 @@
 **   drh@acm.org
 **   http://www.hwaci.com/drh/
 */
+#include <string.h>
 #include <tk.h>
 #include <stdlib.h>
 #include "htmlcmd.h"