--- /dev/null
+--- tk8.5a4/unix/tcl.m4.orig 2006-05-24 07:59:16.403356000 +0200
++++ tk8.5a4/unix/tcl.m4 2006-05-24 17:57:38.087071500 +0200
+@@ -2281,9 +2281,9 @@
+ not_really_there=""
+ if test "$no_x" = ""; then
+ if test "$x_includes" = ""; then
+- AC_TRY_CPP([#include <X11/XIntrinsic.h>], , not_really_there="yes")
++ AC_TRY_CPP([#include <X11/Xlib.h>], , not_really_there="yes")
+ else
+- if test ! -r $x_includes/X11/Intrinsic.h; then
++ if test ! -r $x_includes/X11/Xlib.h; then
+ not_really_there="yes"
+ fi
+ fi
+@@ -2291,11 +2291,11 @@
+ if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
+ AC_MSG_CHECKING([for X11 header files])
+ found_xincludes="no"
+- AC_TRY_CPP([#include <X11/Intrinsic.h>], found_xincludes="yes", found_xincludes="no")
++ AC_TRY_CPP([#include <X11/Xlib.h>], found_xincludes="yes", found_xincludes="no")
+ if test "$found_xincludes" = "no"; then
+ dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include"
+ for i in $dirs ; do
+- if test -r $i/X11/Intrinsic.h; then
++ if test -r $i/X11/Xlib.h; then
+ AC_MSG_RESULT([$i])
+ XINCLUDES=" -I$i"
+ found_xincludes="yes"