Index: Makefile.in
===================================================================
diff -u -rfe19549734064c3a57866e7e47743ec787f647e5 -r76f81e9b67ba799ab8e7ab6ff88a2fb0ecadcff3
--- Makefile.in	(.../Makefile.in)	(revision fe19549734064c3a57866e7e47743ec787f647e5)
+++ Makefile.in	(.../Makefile.in)	(revision 76f81e9b67ba799ab8e7ab6ff88a2fb0ecadcff3)
@@ -429,7 +429,6 @@
 
 xotclsh: tclAppInit.o $(PKG_OBJECTS) $(CONDITIONAL_STUB_OBJECTS)
 	$(CC) -rdynamic -o $@ tclAppInit.o \
-		$(PKG_OBJECTS) \
 		$(CFLAGS)  $(TCL_LIB_SPEC) \
 		$(DMALLOC_LIB) $(CONDITIONAL_STUB_OBJECTS)
 
Fisheye: Tag 76f81e9b67ba799ab8e7ab6ff88a2fb0ecadcff3 refers to a dead (removed) revision in file `generic/xotclAppInit.c'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: unix/tclAppInit.c
===================================================================
diff -u -r9f7fa883bf6ed48f1401f815caca1e34f56584a1 -r76f81e9b67ba799ab8e7ab6ff88a2fb0ecadcff3
--- unix/tclAppInit.c	(.../tclAppInit.c)	(revision 9f7fa883bf6ed48f1401f815caca1e34f56584a1)
+++ unix/tclAppInit.c	(.../tclAppInit.c)	(revision 76f81e9b67ba799ab8e7ab6ff88a2fb0ecadcff3)
@@ -155,11 +155,17 @@
      *
      * where "Mod" is the name of the module.
      */
+#if 0
     if (Xotcl_Init(interp) == TCL_ERROR) {
        return TCL_ERROR;
     }    
  
     Tcl_StaticPackage(interp, "XOTcl", Xotcl_Init, 0);
+#else
+    if (Tcl_PkgRequire(interp, "XOTcl", XOTCLVERSION, 1) == NULL) {
+      return TCL_ERROR;
+    }
+#endif
     if (Tcl_Eval(interp, "::xotcl::use xotcl2") != TCL_OK) {
         return TCL_ERROR;
     }