diff options
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 16 | ||||
| -rw-r--r-- | unix/configure.in | 6 | ||||
| -rw-r--r-- | unix/tk.spec | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/unix/configure b/unix/configure index 6a2b8f5..28f108d 100755 --- a/unix/configure +++ b/unix/configure @@ -1336,9 +1336,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL="b1" +TK_PATCH_LEVEL="b1.1" VERSION=${TK_VERSION} -LOCALES="cs de el en en_gb eo es es_ES fr it nl pl pt ru" +LOCALES="cs de el en en_gb eo es fr hu it nl pl pt ru sv" #-------------------------------------------------------------------- # Find and load the tclConfig.sh file @@ -8780,7 +8780,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. */ @@ -8788,7 +8788,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 @@ -8815,7 +8815,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 @@ -8829,18 +8829,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/configure.in b/unix/configure.in index 90f8326..1c94235 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.139 2007/09/19 17:54:30 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.140 2007/10/02 18:28:15 dgp Exp $ AC_INIT([tk],[8.5]) AC_PREREQ(2.59) @@ -27,9 +27,9 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [ TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL="b1" +TK_PATCH_LEVEL="b1.1" VERSION=${TK_VERSION} -LOCALES="cs de el en en_gb eo es es_ES fr it nl pl pt ru" +LOCALES="cs de el en en_gb eo es fr hu it nl pl pt ru sv" #-------------------------------------------------------------------- # Find and load the tclConfig.sh file diff --git a/unix/tk.spec b/unix/tk.spec index a94350d..ba77bcd 100644 --- a/unix/tk.spec +++ b/unix/tk.spec @@ -1,11 +1,11 @@ -# $Id: tk.spec,v 1.26 2007/09/19 17:54:30 dgp Exp $ +# $Id: tk.spec,v 1.27 2007/10/02 18:28:16 dgp Exp $ # This file is the basis for a binary Tk Linux RPM. %{!?directory:%define directory /usr/local} Name: tk Summary: Tk graphical toolkit for the Tcl scripting language. -Version: 8.5b1 +Version: 8.5b1.1 Release: 2 License: BSD Group: Development/Languages |