diff options
| author | fvogel <fvogelnew1@free.fr> | 2016-03-08 21:56:11 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2016-03-08 21:56:11 (GMT) |
| commit | 42f14fb52f5a0cdf6113741ca6187d7d56fafa32 (patch) | |
| tree | 79a38c0207d5138e80f149d603100beb30fdc85c /unix | |
| parent | d4e3294d3a4adb1370d84500401b26f7279119cc (diff) | |
| parent | 23afeb02af6706ac255b77e35f2cc644d2c4e524 (diff) | |
| download | tk-42f14fb52f5a0cdf6113741ca6187d7d56fafa32.zip tk-42f14fb52f5a0cdf6113741ca6187d7d56fafa32.tar.gz tk-42f14fb52f5a0cdf6113741ca6187d7d56fafa32.tar.bz2 | |
Rebased to core-8-6-branch
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 12 | ||||
| -rw-r--r-- | unix/tk.spec | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/unix/configure b/unix/configure index 3958a6b..5ffc3fa 100755 --- a/unix/configure +++ b/unix/configure @@ -9598,7 +9598,7 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -9606,7 +9606,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <X11/Intrinsic.h> +#include <X11/Xlib.h> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -9633,7 +9633,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -9647,18 +9647,18 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" + LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <X11/Intrinsic.h> +#include <X11/Xlib.h> int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } diff --git a/unix/tk.spec b/unix/tk.spec index af982f7..e43e28e 100644 --- a/unix/tk.spec +++ b/unix/tk.spec @@ -4,7 +4,7 @@ Name: tk Summary: Tk graphical toolkit for the Tcl scripting language. -Version: 8.6.4 +Version: 8.6.5 Release: 2 License: BSD Group: Development/Languages |