From 09d14bd60e383ef4f40c9462f2703d2402faecab Mon Sep 17 00:00:00 2001 From: hunt Date: Tue, 21 Jan 2003 21:35:15 +0000 Subject: [PATCH] 2003-01-21 Martin M. Hunt * src/tkTabletcl.h: Change all references of "tkPriv" to "tk::Priv". Change all references of "tkCancelRepeat" to "tk::CancelRepeat". Needed for tk 8.4.1. * src/tkTable.tcl.h: Ditto. * library/combobox.tcl: Ditto. * src/Makefile.am: Remove tclsizebox.c. * src/Makefile.in: Rebuilt. * aclocal.m4: Rebuilt. * Makefile.in: Rebuilt. * configure: Rebuilt. --- libgui/ChangeLog | 15 +++ libgui/Makefile.in | 9 +- libgui/aclocal.m4 | 52 ++++++++-- libgui/configure | 248 +++++++++++++++++++++++--------------------- libgui/library/Makefile.in | 7 +- libgui/library/combobox.tcl | 2 +- libgui/src/Makefile.am | 2 +- libgui/src/Makefile.in | 24 +++-- libgui/src/tkTable.tcl.h | 62 +++++------ libgui/src/tkTabletcl.h | 62 +++++------ 10 files changed, 271 insertions(+), 212 deletions(-) diff --git a/libgui/ChangeLog b/libgui/ChangeLog index 2547efb771..3cdf00f1c1 100644 --- a/libgui/ChangeLog +++ b/libgui/ChangeLog @@ -1,3 +1,18 @@ +2003-01-21 Martin M. Hunt + + * src/tkTabletcl.h: Change all references of "tkPriv" + to "tk::Priv". Change all references of "tkCancelRepeat" + to "tk::CancelRepeat". Needed for tk 8.4.1. + * src/tkTable.tcl.h: Ditto. + * library/combobox.tcl: Ditto. + + * src/Makefile.am: Remove tclsizebox.c. + * src/Makefile.in: Rebuilt. + + * aclocal.m4: Rebuilt. + * Makefile.in: Rebuilt. + * configure: Rebuilt. + 2002-12-03 Martin M. Hunt * library/pane.tcl: auto_mkindex cannot rebuild diff --git a/libgui/Makefile.in b/libgui/Makefile.in index bdd2a4abdc..a53c3e8680 100644 --- a/libgui/Makefile.in +++ b/libgui/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -124,6 +124,9 @@ TCL_LIB_SPEC = @TCL_LIB_SPEC@ TCL_RANLIB = @TCL_RANLIB@ TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@ TCL_SHLIB_LD = @TCL_SHLIB_LD@ +TIXHDIR = @TIXHDIR@ +TIX_BUILD_LIB_SPEC = @TIX_BUILD_LIB_SPEC@ +TIX_LIB_FULL_PATH = @TIX_LIB_FULL_PATH@ TKCONFIG = @TKCONFIG@ TKHDIR = @TKHDIR@ TK_BUILD_INCLUDES = @TK_BUILD_INCLUDES@ @@ -235,7 +238,7 @@ maintainer-clean-recursive: dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ - test "$$subdir" = "." && dot_seen=yes; \ + test "$$subdir" != "." || dot_seen=yes; \ done; \ test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ diff --git a/libgui/aclocal.m4 b/libgui/aclocal.m4 index 91710bebfe..747026ab70 100644 --- a/libgui/aclocal.m4 +++ b/libgui/aclocal.m4 @@ -1,6 +1,6 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4 +dnl aclocal.m4 generated automatically by aclocal 1.4-p6 -dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -21,8 +21,9 @@ dnl PARTICULAR PURPOSE. dnl Usage: dnl AM_INIT_AUTOMAKE(package,version, [no-define]) -AC_DEFUN(AM_INIT_AUTOMAKE, -[AC_REQUIRE([AC_PROG_INSTALL]) +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] @@ -38,18 +39,47 @@ AC_REQUIRE([AM_SANITY_CHECK]) AC_REQUIRE([AC_ARG_PROGRAM]) dnl FIXME This is truly gross. missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir) AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) AC_REQUIRE([AC_PROG_MAKE_SET])]) +# Copyright 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"]) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION so it can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.4-p6])]) + # # Check to make sure that the build environment is sane. # -AC_DEFUN(AM_SANITY_CHECK, +AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 @@ -90,7 +120,7 @@ AC_MSG_RESULT(yes)]) dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) dnl The program must properly implement --version. -AC_DEFUN(AM_MISSING_PROG, +AC_DEFUN([AM_MISSING_PROG], [AC_MSG_CHECKING(for working $2) # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. @@ -106,7 +136,7 @@ AC_SUBST($1)]) # Like AC_CONFIG_HEADER, but automatically create stamp file. -AC_DEFUN(AM_CONFIG_HEADER, +AC_DEFUN([AM_CONFIG_HEADER], [AC_PREREQ([2.12]) AC_CONFIG_HEADER([$1]) dnl When config.status generates a header, we must update the stamp-h file. @@ -132,7 +162,7 @@ changequote([,]))]) # serial 1 -AC_DEFUN(AM_MAINTAINER_MODE, +AC_DEFUN([AM_MAINTAINER_MODE], [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode is disabled by default AC_ARG_ENABLE(maintainer-mode, @@ -149,7 +179,7 @@ AC_DEFUN(AM_MAINTAINER_MODE, # Define a conditional. -AC_DEFUN(AM_CONDITIONAL, +AC_DEFUN([AM_CONDITIONAL], [AC_SUBST($1_TRUE) AC_SUBST($1_FALSE) if $2; then diff --git a/libgui/configure b/libgui/configure index fff25ce3dd..fb0ce757d0 100755 --- a/libgui/configure +++ b/libgui/configure @@ -44,7 +44,6 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -159,7 +158,6 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -330,11 +328,6 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -500,16 +493,12 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -else - CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -567,6 +556,7 @@ ac_config_guess=$ac_aux_dir/config.guess ac_config_sub=$ac_aux_dir/config.sub ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. +am__api_version="1.4" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -579,7 +569,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:583: checking for a BSD compatible install" >&5 +echo "configure:573: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -632,7 +622,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:636: checking whether build environment is sane" >&5 +echo "configure:626: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -689,7 +679,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:693: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:683: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -734,21 +724,21 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` -echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:739: checking for working aclocal" >&5 +echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6 +echo "configure:729: checking for working aclocal-${am__api_version}" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. -if (aclocal --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL=aclocal +if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then + ACLOCAL=aclocal-${am__api_version} echo "$ac_t""found" 1>&6 else - ACLOCAL="$missing_dir/missing aclocal" + ACLOCAL="$missing_dir/missing aclocal-${am__api_version}" echo "$ac_t""missing" 1>&6 fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:752: checking for working autoconf" >&5 +echo "configure:742: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -760,21 +750,21 @@ else echo "$ac_t""missing" 1>&6 fi -echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:765: checking for working automake" >&5 +echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6 +echo "configure:755: checking for working automake-${am__api_version}" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. -if (automake --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake +if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then + AUTOMAKE=automake-${am__api_version} echo "$ac_t""found" 1>&6 else - AUTOMAKE="$missing_dir/missing automake" + AUTOMAKE="$missing_dir/missing automake-${am__api_version}" echo "$ac_t""missing" 1>&6 fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:778: checking for working autoheader" >&5 +echo "configure:768: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -787,7 +777,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:791: checking for working makeinfo" >&5 +echo "configure:781: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -804,7 +794,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:808: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:798: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -833,7 +823,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:837: checking host system type" >&5 +echo "configure:827: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -856,7 +846,7 @@ echo "$ac_t""$host" 1>&6 # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:860: checking for $ac_word" >&5 +echo "configure:850: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -886,7 +876,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:890: checking for $ac_word" >&5 +echo "configure:880: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -937,7 +927,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:941: checking for $ac_word" >&5 +echo "configure:931: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -969,7 +959,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:973: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:963: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -980,12 +970,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 984 "configure" +#line 974 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1011,12 +1001,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1015: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1005: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1020: checking whether we are using GNU C" >&5 +echo "configure:1010: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1025,7 +1015,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1044,7 +1034,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1048: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1038: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1076,12 +1066,12 @@ else fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1080: checking for Cygwin environment" >&5 +echo "configure:1070: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1109,19 +1099,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1113: checking for mingw32 environment" >&5 +echo "configure:1103: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1140,7 +1130,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1144: checking for executable suffix" >&5 +echo "configure:1134: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1150,10 +1140,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -1171,13 +1161,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1175: checking for object suffix" >&5 +echo "configure:1165: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1219,7 +1209,7 @@ else INSTALL_LIBGUI_FALSE= fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1223: checking build system type" >&5 +echo "configure:1213: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1245,7 +1235,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1249: checking for $ac_word" >&5 +echo "configure:1239: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1277,7 +1267,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1281: checking for $ac_word" >&5 +echo "configure:1271: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1312,7 +1302,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1316: checking for $ac_word" >&5 +echo "configure:1306: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1344,7 +1334,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1348: checking for $ac_word" >&5 +echo "configure:1338: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1379,7 +1369,7 @@ fi # Extract the first word of "itcl_sh", so it can be a program name with args. set dummy itcl_sh; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1383: checking for $ac_word" >&5 +echo "configure:1373: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_ITCL_SH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1408,7 +1398,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1412: checking how to run the C preprocessor" >&5 +echo "configure:1402: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1423,13 +1413,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1440,13 +1430,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1457,13 +1447,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1457: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1490,19 +1480,19 @@ echo "$ac_t""$CPP" 1>&6 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1494: checking for working alloca.h" >&5 +echo "configure:1484: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1523,12 +1513,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1527: checking for alloca" >&5 +echo "configure:1517: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1588,12 +1578,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1592: checking whether alloca needs Cray hooks" >&5 +echo "configure:1582: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1622: checking for $ac_func" >&5 +echo "configure:1612: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1673,7 +1663,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1677: checking stack direction for C alloca" >&5 +echo "configure:1667: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1681,7 +1671,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -1725,17 +1715,17 @@ for ac_hdr in stddef.h stdlib.h getopt.h unistd.h fcntl.h sys/file.h sys/wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1729: checking for $ac_hdr" >&5 +echo "configure:1719: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1739: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1764,12 +1754,12 @@ done for ac_func in raise do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1768: checking for $ac_func" >&5 +echo "configure:1758: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1850,12 +1840,12 @@ fi for ac_func in random drand48 rand do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1854: checking for $ac_func" >&5 +echo "configure:1844: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1904,7 +1894,7 @@ done cat > conftest.$ac_ext < EOF @@ -1928,12 +1918,12 @@ else fi echo $ac_n "checking for cygwin32""... $ac_c" 1>&6 -echo "configure:1932: checking for cygwin32" >&5 +echo "configure:1922: checking for cygwin32" >&5 if eval "test \"`echo '$''{'ide_cv_os_cygwin32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:1992: checking for init.tcl" >&5 +echo "configure:1982: checking for init.tcl" >&5 if eval "test \"`echo '$''{'ac_cv_c_tcl_libdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2023,7 +2013,7 @@ if test "${with_tclconfig+set}" = set; then fi echo $ac_n "checking for Tcl configuration script""... $ac_c" 1>&6 -echo "configure:2027: checking for Tcl configuration script" >&5 +echo "configure:2017: checking for Tcl configuration script" >&5 if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2031,7 +2021,7 @@ else if test x"${with_tclconfig}" != x ; then if test -f "${with_tclconfig}/tclConfig.sh" ; then - ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)` + ac_cv_c_tclconfig=`(cd ${with_tclconfig}; ${PWDCMD-pwd})` else { echo "configure: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" 1>&2; exit 1; } fi @@ -2039,8 +2029,12 @@ else if test x"${ac_cv_c_tclconfig}" = x ; then for i in $dirlist; do - if test -f $srcdir/$i/unix/tclConfig.sh ; then - ac_cv_c_tclconfig=`(cd $srcdir/$i/unix; pwd)` + if test -f $srcdir/$i/unix/tclConfig.sh ; then + ac_cv_c_tclconfig=`(cd $srcdir/$i/unix; ${PWDCMD-pwd})` + break + fi + if test -f $srcdir/$i/win/tclConfig.sh ; then + ac_cv_c_tclconfig=`(cd $srcdir/$i/win; ${PWDCMD-pwd})` break fi done @@ -2054,8 +2048,12 @@ else done for i in `ls -dr $tclconfpath/tcl* 2>/dev/null ` ; do - if test -f $i/unix/tclConfig.sh ; then - ac_cv_c_tclconfig=`(cd $i/unix; pwd)` + if test -f $i/unix/tclConfig.sh ; then + ac_cv_c_tclconfig=`(cd $i/unix; ${PWDCMD-pwd})` + break + fi + if test -f $i/win/tclConfig.sh ; then + ac_cv_c_tclconfig=`(cd $i/win; ${PWDCMD-pwd})` break fi done @@ -2115,7 +2113,7 @@ if test "${with_tkconfig+set}" = set; then fi echo $ac_n "checking for Tk configuration script""... $ac_c" 1>&6 -echo "configure:2119: checking for Tk configuration script" >&5 +echo "configure:2117: checking for Tk configuration script" >&5 if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2123,7 +2121,7 @@ else if test x"${with_tkconfig}" != x ; then if test -f "${with_tkconfig}/tkConfig.sh" ; then - ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)` + ac_cv_c_tkconfig=`(cd ${with_tkconfig}; ${PWDCMD-pwd})` else { echo "configure: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" 1>&2; exit 1; } fi @@ -2131,8 +2129,12 @@ else if test x"${ac_cv_c_tkconfig}" = x ; then for i in $dirlist; do - if test -f $srcdir/$i/unix/tkConfig.sh ; then - ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; pwd)` + if test -f $srcdir/$i/unix/tkConfig.sh ; then + ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; ${PWDCMD-pwd})` + break + fi + if test -f $srcdir/$i/win/tkConfig.sh ; then + ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; ${PWDCMD-pwd})` break fi done @@ -2146,8 +2148,12 @@ else done for i in `ls -dr $tkconfpath/tk* 2>/dev/null ` ; do - if test -f $i/unix/tkConfig.sh ; then - ac_cv_c_tkconfig=`(cd $i/unix; pwd)` + if test -f $i/unix/tkConfig.sh ; then + ac_cv_c_tkconfig=`(cd $i/unix; ${PWDCMD-pwd})` + break + fi + if test -f $i/win/tkConfig.sh ; then + ac_cv_c_tkconfig=`(cd $i/win; ${PWDCMD-pwd})` break fi done @@ -2195,7 +2201,7 @@ fi dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." no_tcl=true echo $ac_n "checking for Tcl headers in the source tree""... $ac_c" 1>&6 -echo "configure:2199: checking for Tcl headers in the source tree" >&5 +echo "configure:2205: checking for Tcl headers in the source tree" >&5 # Check whether --with-tclinclude or --without-tclinclude was given. if test "${with_tclinclude+set}" = set; then withval="$with_tclinclude" @@ -2208,9 +2214,9 @@ else if test x"${with_tclinclude}" != x ; then if test -f ${with_tclinclude}/tcl.h ; then - ac_cv_c_tclh=`(cd ${with_tclinclude}; pwd)` + ac_cv_c_tclh=`(cd ${with_tclinclude}; ${PWDCMD-pwd})` elif test -f ${with_tclinclude}/generic/tcl.h ; then - ac_cv_c_tclh=`(cd ${with_tclinclude}/generic; pwd)` + ac_cv_c_tclh=`(cd ${with_tclinclude}/generic; ${PWDCMD-pwd})` else { echo "configure: error: ${with_tclinclude} directory doesn't contain headers" 1>&2; exit 1; } fi @@ -2219,7 +2225,7 @@ fi if test x"${ac_cv_c_tclconfig}" != x ; then for i in $dirlist; do if test -f $ac_cv_c_tclconfig/$i/generic/tcl.h ; then - ac_cv_c_tclh=`(cd $ac_cv_c_tclconfig/$i/generic; pwd)` + ac_cv_c_tclh=`(cd $ac_cv_c_tclconfig/$i/generic; ${PWDCMD-pwd})` break fi done @@ -2235,7 +2241,7 @@ if test x"${ac_cv_c_tclh}" = x ; then for i in `ls -dr $tclpath/tcl* 2>/dev/null ` ; do if test -f $i/generic/tcl.h ; then - ac_cv_c_tclh=`(cd $i/generic; pwd)` + ac_cv_c_tclh=`(cd $i/generic; ${PWDCMD-pwd})` break fi done @@ -2252,17 +2258,17 @@ if test x"${ac_cv_c_tclh}" = x ; then echo "$ac_t""none" 1>&6 ac_safe=`echo "tcl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tcl.h""... $ac_c" 1>&6 -echo "configure:2256: checking for tcl.h" >&5 +echo "configure:2262: checking for tcl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2326,7 +2332,7 @@ fi dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." no_tk=true echo $ac_n "checking for Tk headers in the source tree""... $ac_c" 1>&6 -echo "configure:2330: checking for Tk headers in the source tree" >&5 +echo "configure:2336: checking for Tk headers in the source tree" >&5 # Check whether --with-tkinclude or --without-tkinclude was given. if test "${with_tkinclude+set}" = set; then withval="$with_tkinclude" @@ -2339,9 +2345,9 @@ else if test x"${with_tkinclude}" != x ; then if test -f ${with_tkinclude}/tk.h ; then - ac_cv_c_tkh=`(cd ${with_tkinclude}; pwd)` + ac_cv_c_tkh=`(cd ${with_tkinclude}; ${PWDCMD-pwd})` elif test -f ${with_tkinclude}/generic/tk.h ; then - ac_cv_c_tkh=`(cd ${with_tkinclude}/generic; pwd)` + ac_cv_c_tkh=`(cd ${with_tkinclude}/generic; ${PWDCMD-pwd})` else { echo "configure: error: ${with_tkinclude} directory doesn't contain headers" 1>&2; exit 1; } fi @@ -2350,7 +2356,7 @@ fi if test x"${ac_cv_c_tkconfig}" != x ; then for i in $dirlist; do if test -f $ac_cv_c_tkconfig/$i/generic/tk.h ; then - ac_cv_c_tkh=`(cd $ac_cv_c_tkconfig/$i/generic; pwd)` + ac_cv_c_tkh=`(cd $ac_cv_c_tkconfig/$i/generic; ${PWDCMD-pwd})` break fi done @@ -2366,7 +2372,7 @@ if test x"${ac_cv_c_tkh}" = x ; then for i in `ls -dr $tkpath/tk* 2>/dev/null ` ; do if test -f $i/generic/tk.h ; then - ac_cv_c_tkh=`(cd $i/generic; pwd)` + ac_cv_c_tkh=`(cd $i/generic; ${PWDCMD-pwd})` break fi done @@ -2637,7 +2643,7 @@ cat >> $CONFIG_STATUS <<\EOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. ac_file=1 # Number of current file. ac_beg=1 # First line for current file. ac_end=$ac_max_sed_cmds # Line after last line for current file. diff --git a/libgui/library/Makefile.in b/libgui/library/Makefile.in index 56a02d72b6..5ded81ee48 100644 --- a/libgui/library/Makefile.in +++ b/libgui/library/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -123,6 +123,9 @@ TCL_LIB_SPEC = @TCL_LIB_SPEC@ TCL_RANLIB = @TCL_RANLIB@ TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@ TCL_SHLIB_LD = @TCL_SHLIB_LD@ +TIXHDIR = @TIXHDIR@ +TIX_BUILD_LIB_SPEC = @TIX_BUILD_LIB_SPEC@ +TIX_LIB_FULL_PATH = @TIX_LIB_FULL_PATH@ TKCONFIG = @TKCONFIG@ TKHDIR = @TKHDIR@ TK_BUILD_INCLUDES = @TK_BUILD_INCLUDES@ diff --git a/libgui/library/combobox.tcl b/libgui/library/combobox.tcl index f31c2179f7..0183712320 100644 --- a/libgui/library/combobox.tcl +++ b/libgui/library/combobox.tcl @@ -834,7 +834,7 @@ proc ::combobox::widgetProc {w command args} { # magic tcl stuff (see tk.tcl in the distribution # lib directory) - tkCancelRepeat + tk::CancelRepeat return 1 } diff --git a/libgui/src/Makefile.am b/libgui/src/Makefile.am index f4295ccd0e..f8397b18ad 100644 --- a/libgui/src/Makefile.am +++ b/libgui/src/Makefile.am @@ -56,7 +56,7 @@ tkTableCmds.c tkTableEdit.c tkTableTag.c tkTableWin.c tkTableUtil.c libgui_a_SOURCES = guitcl.h paths.c subcommand.c subcommand.h \ xpmlib.c tclmain.c tkGraphCanvas.c \ tkCanvEdge.c tkCanvLayout.c tkCanvLayout.h tclhelp.c tclgetdir.c \ -tclwinprint.c tclsizebox.c tclshellexe.c tclmapi.c tclwinfont.c \ +tclwinprint.c tclshellexe.c tclmapi.c tclwinfont.c \ tclwingrab.c tclwinmode.c tclwinpath.c tclmsgbox.c tclcursor.c \ tkWinPrintText.c tkWinPrintCanvas.c tkWarpPointer.c $(TKTABLE_SOURCES) diff --git a/libgui/src/Makefile.in b/libgui/src/Makefile.in index 005994b7b6..85169330bd 100644 --- a/libgui/src/Makefile.in +++ b/libgui/src/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -125,6 +125,9 @@ TCL_LIB_SPEC = @TCL_LIB_SPEC@ TCL_RANLIB = @TCL_RANLIB@ TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@ TCL_SHLIB_LD = @TCL_SHLIB_LD@ +TIXHDIR = @TIXHDIR@ +TIX_BUILD_LIB_SPEC = @TIX_BUILD_LIB_SPEC@ +TIX_LIB_FULL_PATH = @TIX_LIB_FULL_PATH@ TKCONFIG = @TKCONFIG@ TKHDIR = @TKHDIR@ TK_BUILD_INCLUDES = @TK_BUILD_INCLUDES@ @@ -180,7 +183,7 @@ tkTableCmds.c tkTableEdit.c tkTableTag.c tkTableWin.c tkTableUtil.c libgui_a_SOURCES = guitcl.h paths.c subcommand.c subcommand.h \ xpmlib.c tclmain.c tkGraphCanvas.c \ tkCanvEdge.c tkCanvLayout.c tkCanvLayout.h tclhelp.c tclgetdir.c \ -tclwinprint.c tclsizebox.c tclshellexe.c tclmapi.c tclwinfont.c \ +tclwinprint.c tclshellexe.c tclmapi.c tclwinfont.c \ tclwingrab.c tclwinmode.c tclwinpath.c tclmsgbox.c tclcursor.c \ tkWinPrintText.c tkWinPrintCanvas.c tkWarpPointer.c $(TKTABLE_SOURCES) @@ -198,14 +201,13 @@ libgui_a_LIBADD = libgui_a_OBJECTS = paths.$(OBJEXT) subcommand.$(OBJEXT) \ xpmlib.$(OBJEXT) tclmain.$(OBJEXT) tkGraphCanvas.$(OBJEXT) \ tkCanvEdge.$(OBJEXT) tkCanvLayout.$(OBJEXT) tclhelp.$(OBJEXT) \ -tclgetdir.$(OBJEXT) tclwinprint.$(OBJEXT) tclsizebox.$(OBJEXT) \ -tclshellexe.$(OBJEXT) tclmapi.$(OBJEXT) tclwinfont.$(OBJEXT) \ -tclwingrab.$(OBJEXT) tclwinmode.$(OBJEXT) tclwinpath.$(OBJEXT) \ -tclmsgbox.$(OBJEXT) tclcursor.$(OBJEXT) tkWinPrintText.$(OBJEXT) \ -tkWinPrintCanvas.$(OBJEXT) tkWarpPointer.$(OBJEXT) tkTable.$(OBJEXT) \ -tkTableCell.$(OBJEXT) tkTableCellSort.$(OBJEXT) tkTableCmds.$(OBJEXT) \ -tkTableEdit.$(OBJEXT) tkTableTag.$(OBJEXT) tkTableWin.$(OBJEXT) \ -tkTableUtil.$(OBJEXT) +tclgetdir.$(OBJEXT) tclwinprint.$(OBJEXT) tclshellexe.$(OBJEXT) \ +tclmapi.$(OBJEXT) tclwinfont.$(OBJEXT) tclwingrab.$(OBJEXT) \ +tclwinmode.$(OBJEXT) tclwinpath.$(OBJEXT) tclmsgbox.$(OBJEXT) \ +tclcursor.$(OBJEXT) tkWinPrintText.$(OBJEXT) tkWinPrintCanvas.$(OBJEXT) \ +tkWarpPointer.$(OBJEXT) tkTable.$(OBJEXT) tkTableCell.$(OBJEXT) \ +tkTableCellSort.$(OBJEXT) tkTableCmds.$(OBJEXT) tkTableEdit.$(OBJEXT) \ +tkTableTag.$(OBJEXT) tkTableWin.$(OBJEXT) tkTableUtil.$(OBJEXT) CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) diff --git a/libgui/src/tkTable.tcl.h b/libgui/src/tkTable.tcl.h index 614106e98b..2bd04f1726 100644 --- a/libgui/src/tkTable.tcl.h +++ b/libgui/src/tkTable.tcl.h @@ -16,7 +16,7 @@ " }\n" "}\n" "bind Table {\n" -" array set tkPriv {x %x y %y}\n" +" array set tk::Priv {x %x y %y}\n" " tkTableMotion %W [%W index @%x,%y]\n" "}\n" "bind Table {\n" @@ -24,28 +24,28 @@ "}\n" "bind Table {\n" " if {[winfo exists %W]} {\n" -" tkCancelRepeat\n" +" tk::CancelRepeat\n" " %W activate @%x,%y\n" " }\n" "}\n" "bind Table {tkTableBeginExtend %W [%W index @%x,%y]}\n" "bind Table {tkTableBeginToggle %W [%W index @%x,%y]}\n" -"bind Table {tkCancelRepeat}\n" +"bind Table {tk::CancelRepeat}\n" "bind Table {\n" -" array set tkPriv {x %x y %y}\n" +" array set tk::Priv {x %x y %y}\n" " tkTableAutoScan %W\n" "}\n" "bind Table <2> {\n" " %W scan mark %x %y\n" -" array set tkPriv {x %x y %y}\n" -" set tkPriv(mouseMoved) 0\n" +" array set tk::Priv {x %x y %y}\n" +" set tk::Priv(mouseMoved) 0\n" "}\n" "bind Table {\n" -" if {(%x != $tkPriv(x)) || (%y != $tkPriv(y))} { set tkPriv(mouseMoved) 1 }\n" -" if $tkPriv(mouseMoved) { %W scan dragto %x %y }\n" +" if {(%x != $tk::Priv(x)) || (%y != $tk::Priv(y))} { set tk::Priv(mouseMoved) 1 }\n" +" if $tk::Priv(mouseMoved) { %W scan dragto %x %y }\n" "}\n" "bind Table {\n" -" if {!$tkPriv(mouseMoved)} { tk_tablePaste %W [%W index @%x,%y] }\n" +" if {!$tk::Priv(mouseMoved)} { tk_tablePaste %W [%W index @%x,%y] }\n" "}\n" "if {[string comp {} [info command event]]} {\n" " tkTableClipboardKeysyms \n" @@ -96,9 +96,9 @@ " if {[string compare {} %A]} { %W insert active insert %A }\n" "}\n" "bind Table {\n" -" set tkPriv(junk) [%W icursor]\n" -" if {[string compare {} $tkPriv(junk)] && $tkPriv(junk)} {\n" -" %W delete active [expr {$tkPriv(junk)-1}]\n" +" set tk::Priv(junk) [%W icursor]\n" +" if {[string compare {} $tk::Priv(junk)] && $tk::Priv(junk)} {\n" +" %W delete active [expr {$tk::Priv(junk)-1}]\n" " }\n" "}\n" "bind Table {%W delete active insert}\n" @@ -114,7 +114,7 @@ "bind Table {tkTableChangeWidth %W active 1}\n" "bind Table {tkTableChangeWidth %W active -1}\n" "proc tkTableBeginSelect {w el} {\n" -" global tkPriv\n" +" global tk::Priv\n" " if {[scan $el %d,%d r c] != 2} return\n" " switch [$w cget -selectmode] {\n" " multiple {\n" @@ -163,33 +163,33 @@ " $w selection set $el\n" " }\n" " $w selection anchor $el\n" -" set tkPriv(tablePrev) $el\n" +" set tk::Priv(tablePrev) $el\n" " }\n" " default {\n" " if {![$w tag includes title $el]} {\n" " $w selection clear all\n" " $w selection set $el\n" -" set tkPriv(tablePrev) $el\n" +" set tk::Priv(tablePrev) $el\n" " }\n" " $w selection anchor $el\n" " }\n" " }\n" "}\n" "proc tkTableMotion {w el} {\n" -" global tkPriv\n" -" if {![info exists tkPriv(tablePrev)]} {\n" -" set tkPriv(tablePrev) $el\n" +" global tk::Priv\n" +" if {![info exists tk::Priv(tablePrev)]} {\n" +" set tk::Priv(tablePrev) $el\n" " return\n" " }\n" -" if {[string match $tkPriv(tablePrev) $el]} return\n" +" if {[string match $tk::Priv(tablePrev) $el]} return\n" " switch [$w cget -selectmode] {\n" " browse {\n" " $w selection clear all\n" " $w selection set $el\n" -" set tkPriv(tablePrev) $el\n" +" set tk::Priv(tablePrev) $el\n" " }\n" " extended {\n" -" scan $tkPriv(tablePrev) %d,%d r c\n" +" scan $tk::Priv(tablePrev) %d,%d r c\n" " scan $el %d,%d elr elc\n" " if {[$w tag includes title $el]} {\n" " if {$r < [$w cget -titlerows]+[$w cget -roworigin]} {\n" @@ -207,10 +207,10 @@ " $w selection set anchor $elr,[$w index end col]\n" " }\n" " } else {\n" -" $w selection clear anchor $tkPriv(tablePrev)\n" +" $w selection clear anchor $tk::Priv(tablePrev)\n" " $w selection set anchor $el\n" " }\n" -" set tkPriv(tablePrev) $el\n" +" set tk::Priv(tablePrev) $el\n" " }\n" " }\n" "}\n" @@ -221,9 +221,9 @@ " }\n" "}\n" "proc tkTableBeginToggle {w el} {\n" -" global tkPriv\n" +" global tk::Priv\n" " if {[string match extended [$w cget -selectmode]]} {\n" -" set tkPriv(tablePrev) $el\n" +" set tk::Priv(tablePrev) $el\n" " $w selection anchor $el\n" " if [$w selection includes $el] {\n" " $w selection clear $el\n" @@ -233,10 +233,10 @@ " }\n" "}\n" "proc tkTableAutoScan {w} {\n" -" global tkPriv\n" +" global tk::Priv\n" " if {![winfo exists $w]} return\n" -" set x $tkPriv(x)\n" -" set y $tkPriv(y)\n" +" set x $tk::Priv(x)\n" +" set y $tk::Priv(y)\n" " if {$y >= [winfo height $w]} {\n" " $w yview scroll 1 units\n" " } elseif {$y < 0} {\n" @@ -249,10 +249,10 @@ " return\n" " }\n" " tkTableMotion $w [$w index @$x,$y]\n" -" set tkPriv(afterId) [after 50 tkTableAutoScan $w]\n" +" set tk::Priv(afterId) [after 50 tkTableAutoScan $w]\n" "}\n" "proc tkTableMoveCell {w x y} {\n" -" global tkPriv\n" +" global tk::Priv\n" " if {[catch {$w index active row} r]} return\n" " set c [$w index active col]\n" " $w activate [incr r $x],[incr c $y]\n" @@ -266,7 +266,7 @@ " $w selection clear all\n" " $w selection set active\n" " $w selection anchor active\n" -" set tkPriv(tablePrev) [$w index active]\n" +" set tk::Priv(tablePrev) [$w index active]\n" " }\n" " }\n" "}\n" diff --git a/libgui/src/tkTabletcl.h b/libgui/src/tkTabletcl.h index 614106e98b..2bd04f1726 100644 --- a/libgui/src/tkTabletcl.h +++ b/libgui/src/tkTabletcl.h @@ -16,7 +16,7 @@ " }\n" "}\n" "bind Table {\n" -" array set tkPriv {x %x y %y}\n" +" array set tk::Priv {x %x y %y}\n" " tkTableMotion %W [%W index @%x,%y]\n" "}\n" "bind Table {\n" @@ -24,28 +24,28 @@ "}\n" "bind Table {\n" " if {[winfo exists %W]} {\n" -" tkCancelRepeat\n" +" tk::CancelRepeat\n" " %W activate @%x,%y\n" " }\n" "}\n" "bind Table {tkTableBeginExtend %W [%W index @%x,%y]}\n" "bind Table {tkTableBeginToggle %W [%W index @%x,%y]}\n" -"bind Table {tkCancelRepeat}\n" +"bind Table {tk::CancelRepeat}\n" "bind Table {\n" -" array set tkPriv {x %x y %y}\n" +" array set tk::Priv {x %x y %y}\n" " tkTableAutoScan %W\n" "}\n" "bind Table <2> {\n" " %W scan mark %x %y\n" -" array set tkPriv {x %x y %y}\n" -" set tkPriv(mouseMoved) 0\n" +" array set tk::Priv {x %x y %y}\n" +" set tk::Priv(mouseMoved) 0\n" "}\n" "bind Table {\n" -" if {(%x != $tkPriv(x)) || (%y != $tkPriv(y))} { set tkPriv(mouseMoved) 1 }\n" -" if $tkPriv(mouseMoved) { %W scan dragto %x %y }\n" +" if {(%x != $tk::Priv(x)) || (%y != $tk::Priv(y))} { set tk::Priv(mouseMoved) 1 }\n" +" if $tk::Priv(mouseMoved) { %W scan dragto %x %y }\n" "}\n" "bind Table {\n" -" if {!$tkPriv(mouseMoved)} { tk_tablePaste %W [%W index @%x,%y] }\n" +" if {!$tk::Priv(mouseMoved)} { tk_tablePaste %W [%W index @%x,%y] }\n" "}\n" "if {[string comp {} [info command event]]} {\n" " tkTableClipboardKeysyms \n" @@ -96,9 +96,9 @@ " if {[string compare {} %A]} { %W insert active insert %A }\n" "}\n" "bind Table {\n" -" set tkPriv(junk) [%W icursor]\n" -" if {[string compare {} $tkPriv(junk)] && $tkPriv(junk)} {\n" -" %W delete active [expr {$tkPriv(junk)-1}]\n" +" set tk::Priv(junk) [%W icursor]\n" +" if {[string compare {} $tk::Priv(junk)] && $tk::Priv(junk)} {\n" +" %W delete active [expr {$tk::Priv(junk)-1}]\n" " }\n" "}\n" "bind Table {%W delete active insert}\n" @@ -114,7 +114,7 @@ "bind Table {tkTableChangeWidth %W active 1}\n" "bind Table {tkTableChangeWidth %W active -1}\n" "proc tkTableBeginSelect {w el} {\n" -" global tkPriv\n" +" global tk::Priv\n" " if {[scan $el %d,%d r c] != 2} return\n" " switch [$w cget -selectmode] {\n" " multiple {\n" @@ -163,33 +163,33 @@ " $w selection set $el\n" " }\n" " $w selection anchor $el\n" -" set tkPriv(tablePrev) $el\n" +" set tk::Priv(tablePrev) $el\n" " }\n" " default {\n" " if {![$w tag includes title $el]} {\n" " $w selection clear all\n" " $w selection set $el\n" -" set tkPriv(tablePrev) $el\n" +" set tk::Priv(tablePrev) $el\n" " }\n" " $w selection anchor $el\n" " }\n" " }\n" "}\n" "proc tkTableMotion {w el} {\n" -" global tkPriv\n" -" if {![info exists tkPriv(tablePrev)]} {\n" -" set tkPriv(tablePrev) $el\n" +" global tk::Priv\n" +" if {![info exists tk::Priv(tablePrev)]} {\n" +" set tk::Priv(tablePrev) $el\n" " return\n" " }\n" -" if {[string match $tkPriv(tablePrev) $el]} return\n" +" if {[string match $tk::Priv(tablePrev) $el]} return\n" " switch [$w cget -selectmode] {\n" " browse {\n" " $w selection clear all\n" " $w selection set $el\n" -" set tkPriv(tablePrev) $el\n" +" set tk::Priv(tablePrev) $el\n" " }\n" " extended {\n" -" scan $tkPriv(tablePrev) %d,%d r c\n" +" scan $tk::Priv(tablePrev) %d,%d r c\n" " scan $el %d,%d elr elc\n" " if {[$w tag includes title $el]} {\n" " if {$r < [$w cget -titlerows]+[$w cget -roworigin]} {\n" @@ -207,10 +207,10 @@ " $w selection set anchor $elr,[$w index end col]\n" " }\n" " } else {\n" -" $w selection clear anchor $tkPriv(tablePrev)\n" +" $w selection clear anchor $tk::Priv(tablePrev)\n" " $w selection set anchor $el\n" " }\n" -" set tkPriv(tablePrev) $el\n" +" set tk::Priv(tablePrev) $el\n" " }\n" " }\n" "}\n" @@ -221,9 +221,9 @@ " }\n" "}\n" "proc tkTableBeginToggle {w el} {\n" -" global tkPriv\n" +" global tk::Priv\n" " if {[string match extended [$w cget -selectmode]]} {\n" -" set tkPriv(tablePrev) $el\n" +" set tk::Priv(tablePrev) $el\n" " $w selection anchor $el\n" " if [$w selection includes $el] {\n" " $w selection clear $el\n" @@ -233,10 +233,10 @@ " }\n" "}\n" "proc tkTableAutoScan {w} {\n" -" global tkPriv\n" +" global tk::Priv\n" " if {![winfo exists $w]} return\n" -" set x $tkPriv(x)\n" -" set y $tkPriv(y)\n" +" set x $tk::Priv(x)\n" +" set y $tk::Priv(y)\n" " if {$y >= [winfo height $w]} {\n" " $w yview scroll 1 units\n" " } elseif {$y < 0} {\n" @@ -249,10 +249,10 @@ " return\n" " }\n" " tkTableMotion $w [$w index @$x,$y]\n" -" set tkPriv(afterId) [after 50 tkTableAutoScan $w]\n" +" set tk::Priv(afterId) [after 50 tkTableAutoScan $w]\n" "}\n" "proc tkTableMoveCell {w x y} {\n" -" global tkPriv\n" +" global tk::Priv\n" " if {[catch {$w index active row} r]} return\n" " set c [$w index active col]\n" " $w activate [incr r $x],[incr c $y]\n" @@ -266,7 +266,7 @@ " $w selection clear all\n" " $w selection set active\n" " $w selection anchor active\n" -" set tkPriv(tablePrev) [$w index active]\n" +" set tk::Priv(tablePrev) [$w index active]\n" " }\n" " }\n" "}\n" -- 2.11.0