diff options
author | dgp <dgp@noemail.net> | 2009-11-03 20:15:23 (GMT) |
---|---|---|
committer | dgp <dgp@noemail.net> | 2009-11-03 20:15:23 (GMT) |
commit | f548cd23a84eaab47e192bd29d3f2b3aabbe77b1 (patch) | |
tree | a56b6ea35885149c6596f00f3b1380c8a3928302 /unix/configure | |
parent | ff5bc58c7fa0fa0c421bfb52223844b220c8cffc (diff) | |
download | tk-f548cd23a84eaab47e192bd29d3f2b3aabbe77b1.zip tk-f548cd23a84eaab47e192bd29d3f2b3aabbe77b1.tar.gz tk-f548cd23a84eaab47e192bd29d3f2b3aabbe77b1.tar.bz2 |
*** 8.5.8 TAGGED FOR RELEASE ***
* generic/tk.h: Bump to 8.5.8 for release.
* library/tk.tcl:
* unix/configure.in:
* unix/tk.spec:
* win/configure.in:
* README:
* unix/configure: autoconf-2.59
* win/configure:
* changes: Updated for 8.5.8 release.
FossilOrigin-Name: 1a4004c16567e45c079dc51c5938b35f0a9f5d21
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 458ed16..200d652 100755 --- a/unix/configure +++ b/unix/configure @@ -1338,7 +1338,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL=".7" +TK_PATCH_LEVEL=".8" VERSION=${TK_VERSION} LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv" @@ -9906,7 +9906,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. */ @@ -9914,7 +9914,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 @@ -9941,7 +9941,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 @@ -9955,18 +9955,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; } |