From b22e9605ddfb961b8faaa3a290385a2fef766abb Mon Sep 17 00:00:00 2001 From: Martin Hunt Date: Thu, 19 Jul 2001 17:40:09 +0000 Subject: [PATCH] 2001-07-18 Martin M. Hunt * library/util.tcl (find_iwidgets_library): Look for iwidgets3* so we don't accidently find iwidgets2.x. --- gdb/gdbtk/ChangeLog | 5 +++++ gdb/gdbtk/library/util.tcl | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog index 2001d208e5..69217ca633 100644 --- a/gdb/gdbtk/ChangeLog +++ b/gdb/gdbtk/ChangeLog @@ -1,3 +1,8 @@ +2001-07-18 Martin M. Hunt + + * library/util.tcl (find_iwidgets_library): Look + for iwidgets3* so we don't accidently find iwidgets2.x. + 2001-07-16 Nick Duffek * library/regwin.itb (RegWin::build_win): Add radio button diff --git a/gdb/gdbtk/library/util.tcl b/gdb/gdbtk/library/util.tcl index fb227ad4dd..ceba49c331 100644 --- a/gdb/gdbtk/library/util.tcl +++ b/gdb/gdbtk/library/util.tcl @@ -237,7 +237,7 @@ proc find_iwidgets_library {} { set iwidgetsSrcDir [glob -nocomplain [file join \ [file dirname [file dirname $::tcl_library]] \ - itcl iwidgets*]] + itcl iwidgets3*]] # Canonicalize the executable's directory name. It turns out that on Solaris, # info nameofexecutable returns /foo/bar/real_dir/./gdb when gdb is launched from @@ -258,7 +258,7 @@ proc find_iwidgets_library {} { set iwidgetsBuildDir [glob -nocomplain [file join \ [file dirname $exec_name] \ - itcl iwidgets*]] + itcl iwidgets3*]] set initFile [file join [lindex $iwidgetsBuildDir 0] \ unix iwidgets.tcl] @@ -267,7 +267,7 @@ proc find_iwidgets_library {} { # Check in "normal" installed place: "../../share/iwidgets*" set iwidgetsBuildDir [glob -nocomplain [file join \ [file dirname [file dirname $exec_name]] \ - share iwidgets*]] + share iwidgets3*]] set initFile [file join [lindex $iwidgetsBuildDir 0] iwidgets.tcl] } -- 2.11.0