diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-07-05 14:56:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-07-05 14:56:24 (GMT) |
| commit | e4f72b37009bb8416c7fa30e4d9b8414d18fb625 (patch) | |
| tree | 99d17790170d150a13448a0a8204c367e2f89cfe /unix | |
| parent | b13fa29c98001ac352274dd328aa79def0008eb0 (diff) | |
| parent | 46d15df43d66d8b9c51954b1ded8e181058dc686 (diff) | |
| download | tcl-e4f72b37009bb8416c7fa30e4d9b8414d18fb625.zip tcl-e4f72b37009bb8416c7fa30e4d9b8414d18fb625.tar.gz tcl-e4f72b37009bb8416c7fa30e4d9b8414d18fb625.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)
FossilOrigin-Name: a3d5954fa4b83defa156628dc42b88e18cdcfddc
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tcl.m4 | 8 |
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" |