This is the mail archive of the
insight@sources.redhat.com
mailing list for the Insight project.
Re: building Tk from the src tree
"Martin M. Hunt" <hunt@redhat.com> writes:
> Actually we don't really use the same configury. Importing tcl/tk
> 8.4.1 and getting Insight to use it was trivial. But I spent days
> on configury stuff trying to get it to work in our framework. It
> wouldn't surprise me at all to find there were lots of errors in it.
Here is a patch that solved the problem I described. Okay to commit?
2003-10-14 Ben Elliston <bje@wasabisystems.com>
* win/tcl.m4 (SC_PROG_TCLSH): Replace with version from tcl/win.
* win/configure: Regenerate.
Index: win/tcl.m4
===================================================================
RCS file: /cvsroot/gnu/tk/win/tcl.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- win/tcl.m4 11 Apr 2003 02:14:05 -0000 1.2
+++ win/tcl.m4 14 Oct 2003 02:06:32 -0000 1.3
@@ -694,7 +694,12 @@ AC_DEFUN(SC_PROG_TCLSH, [
])
if test -f "$ac_cv_path_tclsh" ; then
- TCLSH_PROG=$ac_cv_path_tclsh
+ TCLSH_PROG="$ac_cv_path_tclsh"
+ AC_MSG_RESULT($TCLSH_PROG)
+ elif test -f "$TCL_BIN_DIR/tclConfig.sh" ; then
+ # One-tree build.
+ ac_cv_path_tclsh="$TCL_BIN_DIR/tclsh"
+ TCLSH_PROG="$ac_cv_path_tclsh"
AC_MSG_RESULT($TCLSH_PROG)
else
AC_MSG_ERROR(No tclsh found in PATH: $search_path)