Diff

Differences From Artifact [04b049978f]:

To Artifact [9210ecc7cd]:


    32     32   #endif
    33     33   
    34     34   #include "tclInt.h"
    35     35   
    36     36   #ifdef KIT_INCLUDES_ITCL
    37     37   Tcl_AppInitProc	Itcl_Init;
    38     38   #endif
    39         -Tcl_AppInitProc	Mk4tcl_Init, Vfs_Init, Rechan_Init, Zlib_Init;
           39  +#ifdef KIT_INCLUDES_MK4TCL
           40  +Tcl_AppInitProc	Mk4tcl_Init
           41  +#endif
           42  +Tcl_AppInitProc Vfs_Init, Rechan_Init, Zlib_Init;
    40     43   #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85
    41     44   Tcl_AppInitProc	Pwb_Init;
    42     45   #endif
    43     46   #ifdef TCL_THREADS
    44     47   Tcl_AppInitProc	Thread_Init;
    45     48   #endif
    46     49   #ifdef _WIN32
................................................................................
    71     74       "info script $old\n"
    72     75       "if {$code == 2} { set code 0 }\n"
    73     76       "return -code $code $res\n"
    74     77   "}\n"
    75     78   #endif
    76     79   "proc tclKitInit {} {\n"
    77     80       "rename tclKitInit {}\n"
    78         -    "load {} Mk4tcl\n"
           81  +    "catch { load {} Mk4tcl }\n"
    79     82       "mk::file open exe [info nameofexecutable] -readonly\n"
    80     83       "set n [mk::select exe.dirs!0.files name boot.tcl]\n"
    81     84       "if {$n != \"\"} {\n"
    82     85           "set s [mk::get exe.dirs!0.files!$n contents]\n"
    83     86   	"if {![string length $s]} { error \"empty boot.tcl\" }\n"
    84     87           "catch {load {} zlib}\n"
    85     88           "if {[mk::get exe.dirs!0.files!$n size] != [string length $s]} {\n"
................................................................................
   129    132   
   130    133   int 
   131    134   TclKit_AppInit(Tcl_Interp *interp)
   132    135   {
   133    136   #ifdef KIT_INCLUDES_ITCL
   134    137       Tcl_StaticPackage(0, "Itcl", Itcl_Init, NULL);
   135    138   #endif 
          139  +#ifdef KIT_INCLUDES_MK4TCL
   136    140       Tcl_StaticPackage(0, "Mk4tcl", Mk4tcl_Init, NULL);
          141  +#endif
   137    142   #if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 85
   138    143       Tcl_StaticPackage(0, "pwb", Pwb_Init, NULL);
   139    144   #endif 
   140    145       Tcl_StaticPackage(0, "rechan", Rechan_Init, NULL);
   141    146       Tcl_StaticPackage(0, "vfs", Vfs_Init, NULL);
   142    147       Tcl_StaticPackage(0, "zlib", Zlib_Init, NULL);
   143    148   #ifdef TCL_THREADS