summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-07-05 14:56:24 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-07-05 14:56:24 (GMT)
commit0d91e00091b24861e400724da7fd54fb8beb3305 (patch)
tree8d18d9e6248970b17ff0df41e7f97092a06b1954 /unix
parentdb6da56aeed8fd3ef50c82f06e1a488fb5d57e3b (diff)
parenteca681b804474b740e51f8be8a67a7b2ceea6e13 (diff)
downloadtcl-0d91e00091b24861e400724da7fd54fb8beb3305.zip
tcl-0d91e00091b24861e400724da7fd54fb8beb3305.tar.gz
tcl-0d91e00091b24861e400724da7fd54fb8beb3305.tar.bz2
Use X11/Xlib.h for checking where X11 can be found in stead of X11/XIntrinsic.h. Suggested by Pietro Cerutti.
(backported from tclconfig)
Diffstat (limited to 'unix')
-rw-r--r--unix/tcl.m48
1 files changed, 4 insertions, 4 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index b69d5a6..4656e61 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2255,9 +2255,9 @@ AC_DEFUN([SC_PATH_X], [
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
@@ -2265,11 +2265,11 @@ AC_DEFUN([SC_PATH_X], [
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"