No comments

diff --git a/src/WOKsite/tclshrc_Wok b/src/WOKsite/tclshrc_Wok
index 1178ce28e3ad833f05252e491114289031388fad..877a03185b0e83175ad49027333f2bb92c885dd6 100755 (executable)
--- a/src/WOKsite/tclshrc_Wok
+++ b/src/WOKsite/tclshrc_Wok
@@ -5,25 +5,18 @@ if { ! [info exists env(WOK_SESSIONID)] } {
  set env(WOK_SESSIONID) "$env(HOME)/.wok"
 }
 
-global tcl_platform
-
-if { "$tcl_platform(platform)"  == "WindowsNT" } {
-       wm withdraw .   
+if {  [info exists env(WOK_LIBRARY)] } {
+    lappend auto_path $env(WOK_LIBRARY)
+    package require Wok
+    package require Ms
+    set tcl_prompt1 {if {[info commands wokcd] != ""}  then \
+           {puts -nonewline stdout "[wokcd]> "} else \
+           {puts -nonewline stdout "tclsh> "}}
+} else {
+    puts stderr "Warning: The environment variable WOK_LIBRARY is mandatory to"
+    puts stderr "         load the package Wok."
+    puts stderr "        "
 }
 
-package require Wok
-package require Ms
-
-if [catch { package require Tclx } TclXHere] {
-    puts stderr "Warning : You'll need package TclX to correctly use WOK."
-    puts stderr "          Check for variable TCLLIBPATH"
-}
-if [catch { package require Expect } ExpectHere] {
-    puts stderr "Warning : You'll need package Expect to use WOK integration package.."
-    puts stderr "          Check for variable TCLLIBPATH"
-}
 
-set tcl_prompt1 {if {[info commands wokcd] != ""}  then \
- {puts -nonewline stdout "[wokcd]> "} else \
- {puts -nonewline stdout "tclsh> "}}
 

diff --git a/src/WOKsite/wokcfg b/src/WOKsite/wokcfg
index f6bb99ae0bdcbbe52c9b8bcce5747398a6f640a3..7b1bd36cf0b02552b6af96917b51142da0085b7c 100755 (executable)
--- a/src/WOKsite/wokcfg
+++ b/src/WOKsite/wokcfg
@@ -123,7 +123,6 @@ switch ( `uname` )
 endsw
 
 setenv PATH            "${TCLHOME}/bin:${PATH}"
-setenv TCLLIBPATH      "${TCLHOME}/lib/itcl ${TCLHOME}/lib  $WOK_LIBRARY/${WOKSTATION}  $WOK_LIBRARY "
 setenv WOK_LIBPATH     ${WOK_LIBRARY}:${WOK_LIBRARY}/${WOKSTATION}
 setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${WOK_LIBRARY}/${WOKSTATION}
 if ( "`uname`" == "HP-UX" ) setenv SHLIB_PATH "${LD_LIBRARY_PATH}:${TCLHOME}/lib/"
@@ -132,7 +131,6 @@ if ( "`uname`" == "AIX" ) setenv LIBPATH "${LD_LIBRARY_PATH}:${TCLHOME}/lib/"
 if ( $justrun ) then
    echo "Now running tclsh using :"
    echo "LD_LIBRARY_PATH = $LD_LIBRARY_PATH"
-   echo "TCLLIBPATH      = $TCLLIBPATH"
    echo "WOKHOME         = $WOKHOME"
    echo "PATH            = $PATH"
    if ( $script ) then