diff options
author | dgp <dgp@noemail.net> | 2017-03-10 18:21:36 (GMT) |
---|---|---|
committer | dgp <dgp@noemail.net> | 2017-03-10 18:21:36 (GMT) |
commit | 274c2266e04476f9714c5db492d5e6b80506a9b6 (patch) | |
tree | 7409ee662bf6b05d120f917fc385f86b2db2494d /unix/configure | |
parent | 372e3a7a788856772cf0251f0c3c3d2003ae4b64 (diff) | |
download | tk-274c2266e04476f9714c5db492d5e6b80506a9b6.zip tk-274c2266e04476f9714c5db492d5e6b80506a9b6.tar.gz tk-274c2266e04476f9714c5db492d5e6b80506a9b6.tar.bz2 |
Start RC branch for Tk 8.6.7
FossilOrigin-Name: 6e14fb54673b7a4df450662032dcf6bb416394cb
Diffstat (limited to 'unix/configure')
-rwxr-xr-x | unix/configure | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/unix/configure b/unix/configure index 565f915..8bd1c0b 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=".6" +TK_PATCH_LEVEL=".7" VERSION=${TK_VERSION} LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv" @@ -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 Xlib.h. + # Guess where to find include files, by looking for Intrinsic.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/Xlib.h> +#include <X11/Intrinsic.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/Xlib.h"; then + if test -r "$ac_dir/X11/Intrinsic.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="-lX11 $LIBS" + LIBS="-lXt $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/Xlib.h> +#include <X11/Intrinsic.h> int main () { -XrmInitialize () +XtMalloc (0) ; return 0; } |