From 91cb693f049e82fd68a6b48a485e25226632789c Mon Sep 17 00:00:00 2001 From: spolk Date: Tue, 27 Jun 2000 21:53:32 +0000 Subject: [PATCH] 2000-06-22 Mo DeJong * library/tree.tcl: Remove use of watch command. Add check to see if toplevel exists to avoid error. 2000-06-22 Mo DeJong * src/tkGraphCanvas.c (GetEdgeNodes): Fixed crash in ckfree caused by call to strdup that was later freed using ckfree. 2000-06-19 Syd Polk * configure.in: Use CYG_AC_PATH_ITCLCONFIG and CYG_AC_LOAD_ITCLCONFIG instead of using exising itclsh. * aclocal.m4: Regenerated with new ../config/acinclude.m4. * configure: Regenerate. * Makefile.in library/Makefile.in src/Makefile.in: Regenerate. --- libgui/ChangeLog | 20 ++++ libgui/Makefile.in | 4 +- libgui/aclocal.m4 | 88 --------------- libgui/configure | 275 ++++++++++++++++++++++++++++----------------- libgui/configure.in | 4 +- libgui/library/Makefile.am | 4 +- libgui/library/Makefile.in | 16 ++- libgui/library/tclIndex | 2 - libgui/library/tree.tcl | 18 ++- libgui/src/Makefile.in | 4 +- libgui/src/tkGraphCanvas.c | 10 +- 11 files changed, 223 insertions(+), 222 deletions(-) diff --git a/libgui/ChangeLog b/libgui/ChangeLog index 1cd8a53a17..623411e5e9 100644 --- a/libgui/ChangeLog +++ b/libgui/ChangeLog @@ -1,3 +1,23 @@ +2000-06-22 Mo DeJong + + * library/tree.tcl: Remove use of watch + command. Add check to see if toplevel + exists to avoid error. + +2000-06-22 Mo DeJong + + * src/tkGraphCanvas.c (GetEdgeNodes): Fixed + crash in ckfree caused by call to strdup that + was later freed using ckfree. + +2000-06-19 Syd Polk + + * configure.in: Use CYG_AC_PATH_ITCLCONFIG and CYG_AC_LOAD_ITCLCONFIG + instead of using exising itclsh. + * aclocal.m4: Regenerated with new ../config/acinclude.m4. + * configure: Regenerate. + * Makefile.in library/Makefile.in src/Makefile.in: Regenerate. + Fri Jun 9 20:43:40 2000 Christopher Faylor * src/paths.c (initialize_paths): Look in /usr/share for stuff. diff --git a/libgui/Makefile.in b/libgui/Makefile.in index 7a33216527..87e5227e8f 100644 --- a/libgui/Makefile.in +++ b/libgui/Makefile.in @@ -110,6 +110,7 @@ SIMHDIR = @SIMHDIR@ SIMLIB = @SIMLIB@ TCLCONFIG = @TCLCONFIG@ TCLHDIR = @TCLHDIR@ +TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@ TCL_CFLAGS = @TCL_CFLAGS@ TCL_DEFS = @TCL_DEFS@ @@ -148,8 +149,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = DIST_COMMON = README ./stamp-h.in ChangeLog Makefile.am Makefile.in \ -TODO acconfig.h acinclude.m4 aclocal.m4 config.h.in configure \ -configure.in +acconfig.h acinclude.m4 aclocal.m4 config.h.in configure configure.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff --git a/libgui/aclocal.m4 b/libgui/aclocal.m4 index d40897afe9..91710bebfe 100644 --- a/libgui/aclocal.m4 +++ b/libgui/aclocal.m4 @@ -160,91 +160,3 @@ else $1_FALSE= fi]) - -# serial 1 - -# @defmac AC_PROG_CC_STDC -# @maindex PROG_CC_STDC -# @ovindex CC -# If the C compiler in not in ANSI C mode by default, try to add an option -# to output variable @code{CC} to make it so. This macro tries various -# options that select ANSI C on some system or another. It considers the -# compiler to be in ANSI C mode if it handles function prototypes correctly. -# -# If you use this macro, you should check after calling it whether the C -# compiler has been set to accept ANSI C; if not, the shell variable -# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source -# code in ANSI C, you can make an un-ANSIfied copy of it by using the -# program @code{ansi2knr}, which comes with Ghostscript. -# @end defmac - -AC_DEFUN(AM_PROG_CC_STDC, -[AC_REQUIRE([AC_PROG_CC]) -AC_BEFORE([$0], [AC_C_INLINE]) -AC_BEFORE([$0], [AC_C_CONST]) -dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require -dnl a magic option to avoid problems with ANSI preprocessor commands -dnl like #elif. -dnl FIXME: can't do this because then AC_AIX won't work due to a -dnl circular dependency. -dnl AC_BEFORE([$0], [AC_PROG_CPP]) -AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) -AC_CACHE_VAL(am_cv_prog_cc_stdc, -[am_cv_prog_cc_stdc=no -ac_save_CC="$CC" -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - AC_TRY_COMPILE( -[#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -], [ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -], -[am_cv_prog_cc_stdc="$ac_arg"; break]) -done -CC="$ac_save_CC" -]) -if test -z "$am_cv_prog_cc_stdc"; then - AC_MSG_RESULT([none needed]) -else - AC_MSG_RESULT($am_cv_prog_cc_stdc) -fi -case "x$am_cv_prog_cc_stdc" in - x|xno) ;; - *) CC="$CC $am_cv_prog_cc_stdc" ;; -esac -]) - diff --git a/libgui/configure b/libgui/configure index f11edd44fc..6460217d14 100755 --- a/libgui/configure +++ b/libgui/configure @@ -27,6 +27,8 @@ ac_help="$ac_help --with-tclinclude directory where tcl headers are" ac_help="$ac_help --with-tkinclude directory where tk headers are" +ac_help="$ac_help + --with-itclconfig directory containing itcl configuration (itclConfig.sh)" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -579,7 +581,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:585: 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 +634,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:638: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -689,7 +691,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:695: 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 @@ -735,7 +737,7 @@ 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 "configure:741: checking for working aclocal" >&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. @@ -748,7 +750,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:752: checking for working autoconf" >&5 +echo "configure:754: 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. @@ -761,7 +763,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:765: checking for working automake" >&5 +echo "configure:767: checking for working automake" >&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. @@ -774,7 +776,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:778: checking for working autoheader" >&5 +echo "configure:780: 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 +789,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:791: checking for working makeinfo" >&5 +echo "configure:793: 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 +806,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:810: 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" @@ -829,7 +831,7 @@ fi # 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:833: checking for $ac_word" >&5 +echo "configure:835: 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 @@ -859,7 +861,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:863: checking for $ac_word" >&5 +echo "configure:865: 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 @@ -910,7 +912,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:914: checking for $ac_word" >&5 +echo "configure:916: 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 @@ -942,7 +944,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:946: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:948: 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. @@ -953,12 +955,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 957 "configure" +#line 959 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:964: \"$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 @@ -984,12 +986,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:988: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:990: 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:993: checking whether we are using GNU C" >&5 +echo "configure:995: 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 @@ -998,7 +1000,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1002: \"$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:1004: \"$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 @@ -1017,7 +1019,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:1021: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1023: 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 @@ -1049,12 +1051,12 @@ else fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1053: checking for Cygwin environment" >&5 +echo "configure:1055: 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:1071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1082,19 +1084,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:1086: checking for mingw32 environment" >&5 +echo "configure:1088: 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:1100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1113,7 +1115,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1117: checking for executable suffix" >&5 +echo "configure:1119: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1123,7 +1125,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj | *.ilk | *.pdb) ;; @@ -1144,13 +1146,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:1148: checking for object suffix" >&5 +echo "configure:1150: 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:1154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1194,7 +1196,7 @@ fi # 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:1198: checking for $ac_word" >&5 +echo "configure:1200: 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 @@ -1221,39 +1223,9 @@ else echo "$ac_t""no" 1>&6 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:1228: 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 - if test -n "$ITCL_SH"; then - ac_cv_prog_ITCL_SH="$ITCL_SH" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_ITCL_SH="itcl_sh" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_ITCL_SH" && ac_cv_prog_ITCL_SH="\$\$here/\$(top_builddir)/../itcl/itcl/unix/itcl_sh\$(EXEEXT)" -fi -fi -ITCL_SH="$ac_cv_prog_ITCL_SH" -if test -n "$ITCL_SH"; then - echo "$ac_t""$ITCL_SH" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1257: checking how to run the C preprocessor" >&5 +echo "configure:1229: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1268,13 +1240,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:1278: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1250: \"$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 : @@ -1285,13 +1257,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:1295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1267: \"$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 : @@ -1302,13 +1274,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:1312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1284: \"$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 : @@ -1335,19 +1307,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:1339: checking for working alloca.h" >&5 +echo "configure:1311: 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:1351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1323: \"$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 @@ -1368,12 +1340,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1372: checking for alloca" >&5 +echo "configure:1344: 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:1377: \"$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 @@ -1433,12 +1405,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1437: checking whether alloca needs Cray hooks" >&5 +echo "configure:1409: 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:1467: checking for $ac_func" >&5 +echo "configure:1439: 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:1467: \"$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 @@ -1518,7 +1490,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1522: checking stack direction for C alloca" >&5 +echo "configure:1494: 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 @@ -1526,7 +1498,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:1521: \"$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 @@ -1570,17 +1542,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:1574: checking for $ac_hdr" >&5 +echo "configure:1546: 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:1584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1556: \"$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* @@ -1609,12 +1581,12 @@ done for ac_func in raise strdup do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1613: checking for $ac_func" >&5 +echo "configure:1585: 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:1613: \"$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 @@ -1695,12 +1667,12 @@ fi for ac_func in random drand48 rand do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1699: checking for $ac_func" >&5 +echo "configure:1671: 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:1699: \"$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 @@ -1749,7 +1721,7 @@ done cat > conftest.$ac_ext < EOF @@ -1774,12 +1746,12 @@ fi echo $ac_n "checking for cygwin32""... $ac_c" 1>&6 -echo "configure:1778: checking for cygwin32" >&5 +echo "configure:1750: 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:1820: checking for init.tcl" >&5 +echo "configure:1792: 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 @@ -1851,7 +1823,7 @@ if test "${with_tclconfig+set}" = set; then fi echo $ac_n "checking for Tcl configuration script""... $ac_c" 1>&6 -echo "configure:1855: checking for Tcl configuration script" >&5 +echo "configure:1827: 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 @@ -1928,6 +1900,7 @@ fi + @@ -1942,7 +1915,7 @@ if test "${with_tkconfig+set}" = set; then fi echo $ac_n "checking for Tk configuration script""... $ac_c" 1>&6 -echo "configure:1946: checking for Tk configuration script" >&5 +echo "configure:1919: 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 @@ -2022,7 +1995,7 @@ fi dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." no_tcl=true echo $ac_n "checking for Tcl headers in the source tree""... $ac_c" 1>&6 -echo "configure:2026: checking for Tcl headers in the source tree" >&5 +echo "configure:1999: 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" @@ -2079,17 +2052,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:2083: checking for tcl.h" >&5 +echo "configure:2056: 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:2093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2066: \"$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* @@ -2153,7 +2126,7 @@ fi dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." no_tk=true echo $ac_n "checking for Tk headers in the source tree""... $ac_c" 1>&6 -echo "configure:2157: checking for Tk headers in the source tree" >&5 +echo "configure:2130: 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" @@ -2230,6 +2203,98 @@ fi +# +# Ok, lets find the itcl configuration +# First, look for one uninstalled. +# the alternative search directory is invoked by --with-itclconfig +# + +if test x"${no_itcl}" = x ; then + # we reset no_itcl in case something fails here + no_itcl=true + # Check whether --with-itclconfig or --without-itclconfig was given. +if test "${with_itclconfig+set}" = set; then + withval="$with_itclconfig" + with_itclconfig=${withval} +fi + + echo $ac_n "checking for Itcl configuration""... $ac_c" 1>&6 +echo "configure:2223: checking for Itcl configuration" >&5 + if eval "test \"`echo '$''{'ac_cv_c_itclconfig'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + + # First check to see if --with-itclconfig was specified. + if test x"${with_itclconfig}" != x ; then + if test -f "${with_itclconfig}/itclConfig.sh" ; then + ac_cv_c_itclconfig=`(cd ${with_itclconfig}; pwd)` + else + { echo "configure: error: ${with_itclconfig} directory doesn't contain itclConfig.sh" 1>&2; exit 1; } + fi + fi + + # then check for a private itcl library + if test x"${ac_cv_c_itclconfig}" = x ; then + for i in \ + ../itcl/itcl \ + `ls -dr ../itcl/itcl[3]* 2>/dev/null` \ + ../../itcl/itcl \ + `ls -dr ../../itcl/itcl[3]* 2>/dev/null` \ + ../../../itcl/itcl \ + `ls -dr ../../../itcl/itcl[3]* 2>/dev/null` ; do + if test -f "$i/itclConfig.sh" ; then + ac_cv_c_itclconfig=`(cd $i; pwd)` + break + fi + done + fi + # check in a few common install locations + if test x"${ac_cv_c_itclconfig}" = x ; then + for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do + if test -f "$i/itclConfig.sh" ; then + ac_cv_c_itclconfig=`(cd $i; pwd)` + break + fi + done + fi + # check in a few other private locations + if test x"${ac_cv_c_itclconfig}" = x ; then + for i in \ + ${srcdir}/../itcl/itcl \ + `ls -dr ${srcdir}/../itcl/itcl[3]* 2>/dev/null` ; do + if test -f "$i/itcl/itclConfig.sh" ; then + ac_cv_c_itclconfig=`(cd $i; pwd)` + break + fi + done + fi + +fi + + if test x"${ac_cv_c_itclconfig}" = x ; then + ITCLCONFIG="# no itcl configs found" + echo "configure: warning: Can't find itcl configuration definitions" 1>&2 + else + no_itcl= + ITCLCONFIG=${ac_cv_c_itclconfig}/itclConfig.sh + echo "$ac_t""found $ITCLCONFIG" 1>&6 + fi +fi + + + + if test -f "$ITCLCONFIG" ; then + . $ITCLCONFIG + fi + + + + + + + + # Make sure we can run config.sub. if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : @@ -2237,7 +2302,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:2241: checking host system type" >&5 +echo "configure:2306: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -2440,7 +2505,6 @@ s%@CROSS_COMPILING_FALSE@%$CROSS_COMPILING_FALSE%g s%@INSTALL_LIBGUI_TRUE@%$INSTALL_LIBGUI_TRUE%g s%@INSTALL_LIBGUI_FALSE@%$INSTALL_LIBGUI_FALSE%g s%@RANLIB@%$RANLIB%g -s%@ITCL_SH@%$ITCL_SH%g s%@CPP@%$CPP%g s%@ALLOCA@%$ALLOCA%g s%@IDE_ENABLED_TRUE@%$IDE_ENABLED_TRUE%g @@ -2461,6 +2525,7 @@ s%@TCL_LD_SEARCH_FLAGS@%$TCL_LD_SEARCH_FLAGS%g s%@TCL_RANLIB@%$TCL_RANLIB%g s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g +s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g s%@TKCONFIG@%$TKCONFIG%g s%@TK_VERSION@%$TK_VERSION%g s%@TK_DEFS@%$TK_DEFS%g @@ -2474,6 +2539,10 @@ s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g s%@TCLHDIR@%$TCLHDIR%g s%@TKHDIR@%$TKHDIR%g +s%@ITCL_BUILD_LIB_SPEC@%$ITCL_BUILD_LIB_SPEC%g +s%@ITCL_SH@%$ITCL_SH%g +s%@ITCL_LIB_FILE@%$ITCL_LIB_FILE%g +s%@ITCL_LIB_FULL_PATH@%$ITCL_LIB_FULL_PATH%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g diff --git a/libgui/configure.in b/libgui/configure.in index 479663d673..7ca0d86044 100644 --- a/libgui/configure.in +++ b/libgui/configure.in @@ -12,8 +12,6 @@ AC_ARG_ENABLE(install-libgui, \ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes) AM_CONDITIONAL(INSTALL_LIBGUI, test x$enable_install_libgui = xyes) AC_PROG_RANLIB -AC_CHECK_PROG(ITCL_SH, itcl_sh, itcl_sh, - [\$\$here/\$(top_builddir)/../itcl/itcl/unix/itcl_sh\$(EXEEXT)]) AC_FUNC_ALLOCA AC_HAVE_HEADERS(stddef.h stdlib.h getopt.h unistd.h fcntl.h sys/file.h sys/wait.h string.h strings.h) @@ -98,6 +96,8 @@ CYG_AC_LOAD_TKCONFIG CYG_AC_PATH_TCLH # FIXME: consider only doing this if --with-x given. CYG_AC_PATH_TKH +CYG_AC_PATH_ITCLCONFIG +CYG_AC_LOAD_ITCLCONFIG dnl what is the path to itclsh? AC_CANONICAL_HOST diff --git a/libgui/library/Makefile.am b/libgui/library/Makefile.am index 843a35d071..8c5599752a 100644 --- a/libgui/library/Makefile.am +++ b/libgui/library/Makefile.am @@ -28,7 +28,7 @@ WISH = wish if CROSS_COMPILING ITCL_SH = itclsh else -ITCL_SH = $$here/../../itcl/itcl/unix/itclsh$(EXEEXT) +ITCL_SH = $$here/../../itcl/itcl/@ITCL_DIR@/itclsh$(EXEEXT) endif tclIndex: $(TCL) @@ -42,6 +42,6 @@ pkgIndex.tcl: @MAINT@ $(PACKAGES) here=`pwd`; \ $(SET_LIB_PATH) \ cd $(srcdir) && \ - echo "pkg_mkIndex . $(PACKAGES); exit" | $(WISH) + echo "pkg_mkIndex . $(PACKAGES); exit" | @ITCL_SH@ ETAGS_ARGS = --lang=none --regex='/[ \t]*\(proc\|method\|itcl_class\)[ \t]+\([^ \t]+\)/\1/' $(TCL) --lang=auto diff --git a/libgui/library/Makefile.in b/libgui/library/Makefile.in index 01461dc4f7..546f7136fb 100644 --- a/libgui/library/Makefile.in +++ b/libgui/library/Makefile.in @@ -109,6 +109,7 @@ SIMHDIR = @SIMHDIR@ SIMLIB = @SIMLIB@ TCLCONFIG = @TCLCONFIG@ TCLHDIR = @TCLHDIR@ +TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@ TCL_CFLAGS = @TCL_CFLAGS@ TCL_DEFS = @TCL_DEFS@ @@ -155,15 +156,12 @@ PACKAGES = combobox.tcl guidir = $(datadir)/cygnus/gui gui_DATA = tclIndex pkgIndex.tcl $(TCL) $(PACKAGES) -@TCL_SHARED_TRUE@SET_LIB_PATH = \ -@TCL_SHARED_TRUE@$(RPATH_ENVVAR)=$$here/../../tcl/unix:$$here/../../itcl/itcl/unix:$$$(RPATH_ENVVAR); export $(RPATH_ENVVAR); -@TCL_SHARED_FALSE@SET_LIB_PATH = \ +@TCL_SHARED_TRUE@SET_LIB_PATH = @TCL_SHARED_TRUE@$(RPATH_ENVVAR)=$$here/../../tcl/unix:$$here/../../itcl/itcl/unix:$$$(RPATH_ENVVAR); export $(RPATH_ENVVAR); +@TCL_SHARED_FALSE@SET_LIB_PATH = WISH = wish -@CROSS_COMPILING_TRUE@ITCL_SH = \ -@CROSS_COMPILING_TRUE@itclsh -@CROSS_COMPILING_FALSE@ITCL_SH = \ -@CROSS_COMPILING_FALSE@$$here/../../itcl/itcl/unix/itclsh$(EXEEXT) +@CROSS_COMPILING_TRUE@ITCL_SH = @CROSS_COMPILING_TRUE@itclsh +@CROSS_COMPILING_FALSE@ITCL_SH = @CROSS_COMPILING_FALSE@$$here/../../itcl/itcl/@ITCL_DIR@/itclsh$(EXEEXT) ETAGS_ARGS = --lang=none --regex='/[ \t]*\(proc\|method\|itcl_class\)[ \t]+\([^ \t]+\)/\1/' $(TCL) --lang=auto mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs @@ -322,13 +320,13 @@ tclIndex: $(TCL) here=`pwd`; \ $(SET_LIB_PATH) \ cd $(srcdir) && \ - echo " auto_mkindex `pwd` $(TCL)" | $(ITCL_SH) + echo "auto_mkindex $(LIBGUI_LIBRARY_DIR) $(TCL)" | @ITCL_SH@ pkgIndex.tcl: @MAINT@ $(PACKAGES) here=`pwd`; \ $(SET_LIB_PATH) \ cd $(srcdir) && \ - echo "pkg_mkIndex . $(PACKAGES); exit" | $(WISH) + echo "pkg_mkIndex . $(PACKAGES); exit" | @ITCL_SH@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libgui/library/tclIndex b/libgui/library/tclIndex index 09d571503d..954442ccf2 100644 --- a/libgui/library/tclIndex +++ b/libgui/library/tclIndex @@ -74,8 +74,6 @@ set auto_index(add_hook) [list source [file join $dir hooks.tcl]] set auto_index(remove_hook) [list source [file join $dir hooks.tcl]] set auto_index(define_hook) [list source [file join $dir hooks.tcl]] set auto_index(run_hooks) [list source [file join $dir hooks.tcl]] -set auto_index(send_mail) [list source [file join $dir internet.tcl]] -set auto_index(open_url) [list source [file join $dir internet.tcl]] set auto_index(Labelledframe) [list source [file join $dir lframe.tcl]] set auto_index(lvarpush) [list source [file join $dir list.tcl]] set auto_index(lvarpop) [list source [file join $dir list.tcl]] diff --git a/libgui/library/tree.tcl b/libgui/library/tree.tcl index 5812436545..c5691d888c 100644 --- a/libgui/library/tree.tcl +++ b/libgui/library/tree.tcl @@ -116,15 +116,13 @@ itcl_class Tree { ::set $thisTail-filter $filter $entry icursor 0 - ::bind $entry "watch y; $this fill; watch n" + ::bind $entry "$this fill" #make binding ctrl-u/l/r for filtering ::bind $tree " - watch y $this config -filter \"*\" $this fill focus %W - watch n break " ::bind $tree [::bind $tree ] @@ -170,7 +168,11 @@ itcl_class Tree { #propagate if {! $propagate} { - after idle "update idletasks; pack propagate [winfo toplevel $tree] $propagate" +#FIXME: what is the following code doing? +# I am currently seeing an error in this callback because the toplevel window does not exist. +# after idle "update idletasks; pack propagate $top $propagate" +set top [winfo toplevel $tree] +after idle "update idletasks ; if \[winfo exists $top\] \{pack propagate $top\}" } } @@ -334,9 +336,7 @@ itcl_class Tree { calculate_column_filter - watch y $this - fill - watch n $this + fillg resize_widget $tree @@ -392,10 +392,8 @@ itcl_class Tree { calculate_column_filter if {$col_filter != $old_col_filter} { - watch y $this fill resize_widget $tree - watch n $this } } @@ -859,7 +857,7 @@ itcl_class Tree { -text $lbl \ -anchor $anchor \ -relief raised \ - -command "watch y; $this resort $i; watch n" + -command "$this resort $i" ::bind $lframe.size.btn$i \ "$this edit_column_filter %W $i %X %Y" diff --git a/libgui/src/Makefile.in b/libgui/src/Makefile.in index 637fa24f5d..d104875833 100644 --- a/libgui/src/Makefile.in +++ b/libgui/src/Makefile.in @@ -110,6 +110,7 @@ SIMHDIR = @SIMHDIR@ SIMLIB = @SIMLIB@ TCLCONFIG = @TCLCONFIG@ TCLHDIR = @TCLHDIR@ +TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@ TCL_CFLAGS = @TCL_CFLAGS@ TCL_DEFS = @TCL_DEFS@ @@ -145,8 +146,7 @@ AUTOMAKE_OPTIONS = cygnus noinst_LIBRARIES = libgui.a -@INSTALL_LIBGUI_TRUE@include_HEADERS = \ -@INSTALL_LIBGUI_TRUE@\ +@INSTALL_LIBGUI_TRUE@include_HEADERS = @INSTALL_LIBGUI_TRUE@\ @INSTALL_LIBGUI_TRUE@ guitcl.h subcommand.h TBL_VERSION = 2.1 diff --git a/libgui/src/tkGraphCanvas.c b/libgui/src/tkGraphCanvas.c index c6ed1e71ee..9b91475b8e 100644 --- a/libgui/src/tkGraphCanvas.c +++ b/libgui/src/tkGraphCanvas.c @@ -250,6 +250,7 @@ GetEdgeNodes(interp,canvasPtr,i,fp,tp) { int argc; char** argv; + char * buf; /* Read the from node id of this edge. */ Tk_ConfigureInfo(interp, canvasPtr->tkwin, @@ -259,7 +260,10 @@ GetEdgeNodes(interp,canvasPtr,i,fp,tp) &argc, &argv) != TCL_OK) { return TCL_ERROR; } - *fp = strdup(argv[4]); + /* This should actuall be a call like Tcl_Strdup() */ + buf = (char*)ckalloc (strlen(argv[4])+1); + strcpy (buf, argv[4]); + *fp = buf; ckfree((char*)argv); /* Read the to node id of this edge. */ Tk_ConfigureInfo(interp, canvasPtr->tkwin, @@ -269,7 +273,9 @@ GetEdgeNodes(interp,canvasPtr,i,fp,tp) &argc, &argv) != TCL_OK) { return TCL_ERROR; } - *tp = strdup(argv[4]); + buf = (char*)ckalloc (strlen(argv[4])+1); + strcpy (buf, argv[4]); + *tp = buf; ckfree((char*)argv); Tcl_ResetResult(interp); return TCL_OK; -- 2.11.0