tcl-websh-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ron...@apache.org
Subject svn commit: r743322 - in /tcl/websh/trunk/src: tests/mintest.test unix/Makefile.in unix/configure.in
Date Wed, 11 Feb 2009 13:09:38 GMT
Author: ronnie
Date: Wed Feb 11 13:09:38 2009
New Revision: 743322

URL: http://svn.apache.org/viewvc?rev=743322&view=rev
Log:
- prepare for Tcl8.6

Modified:
    tcl/websh/trunk/src/tests/mintest.test
    tcl/websh/trunk/src/unix/Makefile.in
    tcl/websh/trunk/src/unix/configure.in

Modified: tcl/websh/trunk/src/tests/mintest.test
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/tests/mintest.test?rev=743322&r1=743321&r2=743322&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/mintest.test (original)
+++ tcl/websh/trunk/src/tests/mintest.test Wed Feb 11 13:09:38 2009
@@ -42,8 +42,11 @@
     set ok 0
     set v [info tclversion]
     regsub {\.} $v {} win
-    foreach tclsh "$v $win 8.5 85 8.4 84 8.3 83 8.2 82 {}" {
+    foreach tclsh "$v $win 8.6 86 8.5 85 8.4 84 8.3 83 8.2 82 {}" {
 	if {![catch {exec tclsh$tclsh < $fnb}]} {
+	    if {$tclsh != $v && $tclsh != $win} {
+		puts stderr "Warning: Using tclsh$tclsh instead of tclsh[info tclversion]"
+	    }
 	    set ok 1
 	    break
 	}

Modified: tcl/websh/trunk/src/unix/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/unix/Makefile.in?rev=743322&r1=743321&r2=743322&view=diff
==============================================================================
--- tcl/websh/trunk/src/unix/Makefile.in (original)
+++ tcl/websh/trunk/src/unix/Makefile.in Wed Feb 11 13:09:38 2009
@@ -257,10 +257,10 @@
 
 websh$(VERSION): tclAppInit.$(OBJEXT) $(web_OBJECTS)
 	$(CC) @LDFLAGS@ tclAppInit.$(OBJEXT) $(web_OBJECTS) \
-	$(TCL_LIB_SPEC) $(TCL_LIBS) $(TCL_LD_FLAGS) -o websh$(VERSION)
+	$(TCL_LIB_SPEC) $(TCL_STUB_LIB_SPEC) $(TCL_LIBS) $(TCL_LD_FLAGS) -o websh$(VERSION)
 
 mod_websh$(MODULE_LIB_SUFFIX): $(web_ap_OBJECTS)
-	$(SHLIB_LD_CURRENT) -o mod_websh$(MODULE_LIB_SUFFIX) $(web_ap_OBJECTS) $(TCL_LIB_SPEC)
+	$(SHLIB_LD_CURRENT) -o mod_websh$(MODULE_LIB_SUFFIX) $(web_ap_OBJECTS) $(TCL_LIB_SPEC) $(TCL_STUB_LIB_SPEC)
 
 mod_websh$(UNSHARED_LIB_SUFFIX): $(web_ap_OBJECTS)
 	$(STLIB_LD) $(TCL_LD_FLAGS) -o mod_websh$(UNSHARED_LIB_SUFFIX) $(web_ap_OBJECTS)
@@ -269,14 +269,14 @@
 
 websh$(VERSION).pure: tclAppInit.$(OBJEXT) $(web_OBJECTS)
 	purify $(CC) @LDFLAGS@ tclAppInit.$(OBJEXT) $(web_OBJECTS) \
-	$(TCL_LIB_SPEC) $(TCL_LD_FLAGS) -o websh$(VERSION).pure
+	$(TCL_LIB_SPEC) $(TCL_STUB_LIB_SPEC) $(TCL_LD_FLAGS) -o websh$(VERSION).pure
 	-rm -f *_pure_*.o
 
 cov: websh$(VERSION).cov
 
 websh$(VERSION).cov: tclAppInit.$(OBJEXT) $(web_OBJECTS)
 	purecov $(CC) @LDFLAGS@ tclAppInit.$(OBJEXT) $(web_OBJECTS) \
-	$(TCL_LIB_SPEC) $(TCL_LD_FLAGS) -o websh$(VERSION).cov
+	$(TCL_LIB_SPEC) $(TCL_STUB_LIB_SPEC) $(TCL_LD_FLAGS) -o websh$(VERSION).cov
 	-rm -f *_pure_*.o
 
 .SUFFIXES: .c .o .obj

Modified: tcl/websh/trunk/src/unix/configure.in
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/unix/configure.in?rev=743322&r1=743321&r2=743322&view=diff
==============================================================================
--- tcl/websh/trunk/src/unix/configure.in (original)
+++ tcl/websh/trunk/src/unix/configure.in Wed Feb 11 13:09:38 2009
@@ -397,11 +397,20 @@
 #     Like `AC_CHECK_PROGS', but if any of PROGS-TO-CHECK-FOR are found,
 #     set VARIABLE to the entire path of the program found.
 
+# search in configured path first
 AC_PATH_PROGS(TCLSH_PROG, \
-  tclsh8.5${EXEEXT} tclsh85${EXEEXT} tclsh8.4${EXEEXT} tclsh84${EXEEXT} tclsh8.3${EXEEXT}
tclsh83${EXEEXT} tclsh8.2${EXEEXT} tclsh82${EXEEXT}, :, \
-  :${TCL_PACKAGE_PATH}/../bin:.:${prefix}:${exec_prefix}:${PATH})
+  tclsh8.6${EXEEXT} tclsh86${EXEEXT} tclsh8.5${EXEEXT} tclsh85${EXEEXT} tclsh8.4${EXEEXT}
tclsh84${EXEEXT} tclsh8.3${EXEEXT} tclsh83${EXEEXT} tclsh8.2${EXEEXT} tclsh82${EXEEXT}, :,
\
+  :${TCL_BIN_DIR}/../bin)
 
 if test "x${TCLSH_PROG}" = "x:" ; then
+   # search in additional paths
+   AC_PATH_PROGS(TCLSH_PROG, \
+     tclsh8.6${EXEEXT} tclsh86${EXEEXT} tclsh8.5${EXEEXT} tclsh85${EXEEXT} tclsh8.4${EXEEXT}
tclsh84${EXEEXT} tclsh8.3${EXEEXT} tclsh83${EXEEXT} tclsh8.2${EXEEXT} tclsh82${EXEEXT}, :,
\
+       :.:${prefix}:${exec_prefix}:${PATH})
+fi
+
+# if nothing was found
+if test "x${TCLSH_PROG}" = "x:" ; then
     AC_ERROR(needed tclsh not found)
 fi
 



---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org


Mime
View raw message