diff options
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rw-r--r-- | unix/dltest/pkgb.c | 4 | ||||
| -rw-r--r-- | unix/tcl.m4 | 59 |
3 files changed, 58 insertions, 9 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 36e4118..5cad0a8 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -840,8 +840,8 @@ install-libraries: libraries do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; - @echo "Installing package http 2.8.6 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.6.tm; + @echo "Installing package http 2.8.7 as a Tcl Module"; + @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.7.tm; @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; @for i in $(TOP_DIR)/library/opt/*.tcl ; \ do \ diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c index ad61d77..f102496 100644 --- a/unix/dltest/pkgb.c +++ b/unix/dltest/pkgb.c @@ -144,7 +144,7 @@ Pkgb_Init( if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) { return TCL_ERROR; } - code = Tcl_PkgProvideEx(interp, "Pkgb", "2.3", NULL); + code = Tcl_PkgProvide(interp, "Pkgb", "2.3"); if (code != TCL_OK) { return code; } @@ -181,7 +181,7 @@ Pkgb_SafeInit( if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) { return TCL_ERROR; } - code = Tcl_PkgProvideEx(interp, "Pkgb", "2.3", NULL); + code = Tcl_PkgProvide(interp, "Pkgb", "2.3"); if (code != TCL_OK) { return code; } diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 3fa6abe..771c6cc 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -449,11 +449,44 @@ AC_DEFUN([SC_LOAD_TKCONFIG], [ AC_DEFUN([SC_PROG_TCLSH], [ AC_MSG_CHECKING([for tclsh]) + AC_CACHE_VAL(ac_cv_path_tclsh, [ search_path=`echo ${PATH} | sed -e 's/:/ /g'` - for dir in $search_path ; do - for j in `ls -r $dir/tclsh[[8-9]]* 2> /dev/null` \ - `ls -r $dir/tclsh* 2> /dev/null` ; do + # Attempt to find Tcl8.6 + + for dir in $search_path ; do + for j in \ + `ls -r $dir/tclsh8[[6-9]] 2> /dev/null` \ + ; do + if test x"$ac_cv_path_tclsh" = x ; then + if test -f "$j" ; then + ac_cv_path_tclsh=$j + break + fi + fi + done + done + if test -e "$ac_cv_path_tclsh" ; then + # Attempt to find Tcl9+ or later + for dir in $search_path ; do + for j in \ + `ls -r $dir/tclsh9* 2> /dev/null` \ + ; do + if test x"$ac_cv_path_tclsh" = x ; then + if test -f "$j" ; then + ac_cv_path_tclsh=$j + break + fi + fi + done + done + fi + if test -e "$ac_cv_path_tclsh" ; then + # Attempt to find any tclsh8.5 on the system + for dir in $search_path ; do + for j in \ + `ls -r $dir/tclsh8[[5-9]] 2> /dev/null` \ + ; do if test x"$ac_cv_path_tclsh" = x ; then if test -f "$j" ; then ac_cv_path_tclsh=$j @@ -461,12 +494,28 @@ AC_DEFUN([SC_PROG_TCLSH], [ fi fi done - done + done + fi + if test -e "$ac_cv_path_tclsh" ; then + # Attempt to find any tclsh on the system + for dir in $search_path ; do + for j in \ + `ls -r $dir/tclsh* 2> /dev/null` \ + ; do + if test x"$ac_cv_path_tclsh" = x ; then + if test -f "$j" ; then + ac_cv_path_tclsh=$j + break + fi + fi + done + done + fi ]) if test -f "$ac_cv_path_tclsh" ; then TCLSH_PROG="$ac_cv_path_tclsh" - AC_MSG_RESULT([$TCLSH_PROG]) + AC_MSG_RESULT($TCLSH_PROG) else # It is not an error if an installed version of Tcl can't be located. TCLSH_PROG="" |