--- scripts/configure.orig	Tue Oct 24 21:09:50 2006
+++ scripts/configure	Wed Jan 10 21:17:08 2007
@@ -8180,8 +8180,9 @@
 fi
 
 if test $usingTcl ; then
+	echo "=============>$target"
   case $target in
-    *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*)
+    *-sunos4*|*-*-netbsd|NetBSD-*|*-*-freebsd*|OpenBSD-*)
       TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
       TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
       ;;
@@ -8421,7 +8422,7 @@
 #define HAVE_PTHREADS 1
 _ACEOF
 
-    gr_libs="$gr_libs -lpthread"
+    gr_libs="$gr_libs $PTHREAD_LIBS"
     gr_srcs="$gr_srcs thread.c"
     gr_hsrcs=""
     gr_hprog=""
@@ -10258,9 +10259,8 @@
 
     *-freebsd*)
       # Not available on all versions:  check for include file.
-      SHLIB_CFLAGS="-fpic"
+      SHLIB_CFLAGS=${PIC_CFLAGS}
       LDDL_FLAGS="-shared ${LIB_SPECS}"
-      CFLAGS="${CFLAGS} -l/usr/X11R6/include"
       ;;
 
     *-netbsd*|*-openbsd*)