diff options
author | dgp <dgp@users.sourceforge.net> | 2010-05-03 16:30:14 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2010-05-03 16:30:14 (GMT) |
commit | 2e06ee1ffbe3d942b788eb71313d236ce5c412d6 (patch) | |
tree | 49bcad0d293627680c79473615c7e6a2389b45ad /unix/configure | |
parent | 7d9b01a703f0399154c77bc601a9fca02e442a7e (diff) | |
download | tk-2e06ee1ffbe3d942b788eb71313d236ce5c412d6.zip tk-2e06ee1ffbe3d942b788eb71313d236ce5c412d6.tar.gz tk-2e06ee1ffbe3d942b788eb71313d236ce5c412d6.tar.bz2 |
* generic/tk.h: Bump patchlevel to 8.6b1.2 to distinguish
* library/tk.tcl: CVS snapshots from earlier snapshots as well
* unix/configure.in: as the 8.6b1 and 8.6b2 releases.
* win/configure.in:
* unix/configure: autoconf-2.59
* win/configure:
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 862ca1d..b527327 100755 --- a/unix/configure +++ b/unix/configure @@ -1339,7 +1339,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu TK_VERSION=8.6 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=6 -TK_PATCH_LEVEL="b1.1" +TK_PATCH_LEVEL="b1.2" VERSION=${TK_VERSION} LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv" @@ -9847,7 +9847,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. */ @@ -9855,7 +9855,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 @@ -9882,7 +9882,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 @@ -9896,18 +9896,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; } |