diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2019-09-02 13:48:07 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2019-09-02 13:48:07 (GMT) |
| commit | f44aa5c0157a509a8242a1fdf2813f3cae6eef27 (patch) | |
| tree | 24d9aa4502fb83c853046bece8f3e7a2fb8d4c60 /unix | |
| parent | 06d12e69e9974547cb077ad90a2fbff640b8d5ee (diff) | |
| parent | 6a358e30155c94e44a4fd964ac793161cbc36164 (diff) | |
| download | tk-f44aa5c0157a509a8242a1fdf2813f3cae6eef27.zip tk-f44aa5c0157a509a8242a1fdf2813f3cae6eef27.tar.gz tk-f44aa5c0157a509a8242a1fdf2813f3cae6eef27.tar.bz2 | |
Merge recent fixes for macOS into release branch from core-8-6-branch
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 1 | ||||
| -rwxr-xr-x | unix/configure | 14 | ||||
| -rw-r--r-- | unix/tkUnixPort.h | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 48e9c3d..c6f8c25 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -35,6 +35,7 @@ bindir = @bindir@ libdir = @libdir@ includedir = @includedir@ datarootdir = @datarootdir@ +runstatedir = @runstatedir@ mandir = @mandir@ # The following definition can be set to non-null for special systems diff --git a/unix/configure b/unix/configure index 074636b..bf1e343 100755 --- a/unix/configure +++ b/unix/configure @@ -1338,7 +1338,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu TK_VERSION=8.6 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=6 -TK_PATCH_LEVEL=".10" +TK_PATCH_LEVEL=".9" VERSION=${TK_VERSION} LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv" @@ -9461,7 +9461,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. */ @@ -9469,7 +9469,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 @@ -9496,7 +9496,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 @@ -9510,18 +9510,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/tkUnixPort.h b/unix/tkUnixPort.h index dbd5e09..b6a35d8 100644 --- a/unix/tkUnixPort.h +++ b/unix/tkUnixPort.h @@ -28,6 +28,7 @@ #else # include <stdlib.h> #endif +#include <assert.h> #include <string.h> #include <sys/types.h> #include <sys/file.h> |