diff options
Diffstat (limited to 'win/configure')
| -rwxr-xr-x | win/configure | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/win/configure b/win/configure index ffe25ec..7d3090a 100755 --- a/win/configure +++ b/win/configure @@ -1709,14 +1709,21 @@ echo "configure:1661: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 + echo $ac_n "checking for tclsh in Tcl build directory""... $ac_c" 1>&6 +echo "configure:1714: checking for tclsh in Tcl build directory" >&5 + BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT} + echo "$ac_t""$BUILD_TCLSH" 1>&6 + + + echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:1714: checking for tclsh" >&5 +echo "configure:1721: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - search_path=`echo ${exec_prefix}/bin:${prefix}/bin:${TCL_BIN_DIR}:${TCL_BIN_DIR}/../bin:${PATH} | sed -e 's/:/ /g'` + search_path=`echo ${PATH} | sed -e 's/:/ /g'` for dir in $search_path ; do for j in `ls -r $dir/tclsh[8-9]*.exe 2> /dev/null` \ `ls -r $dir/tclsh* 2> /dev/null` ; do @@ -1735,13 +1742,10 @@ fi if test -f "$ac_cv_path_tclsh" ; then TCLSH_PROG="$ac_cv_path_tclsh" echo "$ac_t""$TCLSH_PROG" 1>&6 - 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" - echo "$ac_t""$TCLSH_PROG" 1>&6 else - { echo "configure: error: No tclsh found in PATH: $search_path" 1>&2; exit 1; } + # It is not an error if an installed version of Tcl can't be located. + TCLSH_PROG="" + echo "$ac_t""No tclsh found on PATH" 1>&6 fi @@ -2060,6 +2064,7 @@ s%@TCL_STUB_LIB_FILE@%$TCL_STUB_LIB_FILE%g s%@TCL_STUB_LIB_FLAG@%$TCL_STUB_LIB_FLAG%g s%@TCL_STUB_LIB_SPEC@%$TCL_STUB_LIB_SPEC%g s%@TCL_DEFS@%$TCL_DEFS%g +s%@BUILD_TCLSH@%$BUILD_TCLSH%g s%@TCLSH_PROG@%$TCLSH_PROG%g s%@TK_VERSION@%$TK_VERSION%g s%@TK_MAJOR_VERSION@%$TK_MAJOR_VERSION%g |