--- configure.orig	Mon Nov 13 16:57:42 2006
+++ configure	Thu Nov 30 22:49:10 2006
@@ -24040,6 +24040,7 @@
 
 
 SEARCH_INCLUDE="\
+    $X11BASE/include          \
     /usr/local/include        \
                               \
     /usr/Motif-2.1/include    \
@@ -38999,7 +39000,7 @@
                 fi
                 ;;
           *-*-freebsd*)
-                                                THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
+                                                THREAD_OPTS="${PTHREAD_LIBS}"
                 ;;
           *-*-darwin* | *-*-cygwin* )
                                                 THREAD_OPTS=""
@@ -41649,7 +41650,7 @@
         OPTIMISE_CFLAGS="-O"
     fi
 fi
-
+OPTIMISE_CFLAGS=
 
 if test "x$WXWIN_COMPATIBILITY_2_4" = "xyes"; then
     cat >>confdefs.h <<\_ACEOF
