diff -u -x configure -x autom4te.cache -x .DS_Store -r -N orig/xotcl-1.1.0/generic/predefined.xotcl xotcl/generic/predefined.xotcl
--- orig/xotcl-1.1.0/generic/predefined.xotcl	Mon Nov 17 01:27:44 2003
+++ xotcl/generic/predefined.xotcl	Fri Dec  5 19:34:36 2003
@@ -13,11 +13,11 @@
 #  ::xotcl::my cleanup
 #  ::set cl [::xotcl::my info class]
 #  ::set pcl [$cl info parameterclass]
-#  $pcl searchDefaults [self]
+#  $pcl searchDefaults [::xotcl::self]
 #  if {![eval ::xotcl::my initmethods $args]} {
 #    eval ::xotcl::my init $args
 #  }
-#  return [self]
+#  return [::xotcl::self]
 #}
 
 # provide some Tcl-commands as methods for Objects
@@ -25,7 +25,7 @@
   ::xotcl::Object insttclcmd $cmd
 }
 
-::xotcl::Object instproc defaultmethod {} {return [self]}
+::xotcl::Object instproc defaultmethod {} {return [::xotcl::self]}
 # support for XOTcl specifics
 ::xotcl::Object instproc filterappend f {
   ::xotcl::my filter [concat [::xotcl::my info filter -guards] $f]
@@ -61,7 +61,7 @@
 }
 ::xotcl::Class::Parameter superclass ::xotcl::Class
 ::xotcl::Class::Parameter instproc mkParameter {obj name args} {
-  #puts "[self proc] $obj $name <$args>"
+  #puts "[::xotcl::self proc] $obj $name <$args>"
   if {[$obj exists $name]} {
     eval [$obj set $name] configure $args
   } else {
@@ -69,17 +69,17 @@
   }
 }
 ::xotcl::Class::Parameter instproc getParameter {obj name args} {
-  #puts "[self proc] $obj $name <$args>"
+  #puts "[::xotcl::self proc] $obj $name <$args>"
   [$obj set $name]
 }
 
 
 ::xotcl::Class::Parameter proc Class {param args} {
-  #puts "*** [self] parameter: [self proc] '$param' <$args>"
+  #puts "*** [::xotcl::self] parameter: [::xotcl::self proc] '$param' <$args>"
   ::xotcl::my set access [lindex $param 0]
   ::xotcl::my set setter mkParameter
   ::xotcl::my set getter getParameter
-  ::xotcl::my set extra {[self]}
+  ::xotcl::my set extra {[::xotcl::self]}
   ::xotcl::my set defaultParam [lrange $param 1 end]
 }
 ::xotcl::Class::Parameter proc default {val} {
@@ -93,11 +93,11 @@
 }
 ::xotcl::Class::Parameter proc access obj {
   ::xotcl::my set access $obj
-  ::xotcl::my set extra \[self\]
+  ::xotcl::my set extra \[::xotcl::self\]
   foreach v [$obj info vars] {::xotcl::my set $v [$obj set $v]}
 }
 ::xotcl::Class::Parameter proc mkGetterSetter {cl name args} {
-  #puts stderr "[self proc] $cl $name <$args> [llength $args]"
+  #puts stderr "[::xotcl::self proc] $cl $name <$args> [llength $args]"
   set l [llength $args]
   if {$l == 0} {
     $cl instparametercmd $name
@@ -147,8 +147,8 @@
 	must be either 'proc' or 'instproc'."
   }
   ::xotcl::my $methtype $methname $arglist "
-    if {\[self callingproc\] != \[self proc\] && 
-	\[self callingobject\] != \[self\]} {
+    if {\[::xotcl::self callingproc\] != \[::xotcl::self proc\] && 
+	\[::xotcl::self callingobject\] != \[::xotcl::self\]} {
       error \"Abstract method $methname $arglist called\"
     } else {next}
   "
@@ -241,7 +241,7 @@
 }
 
 ::xotcl::Object::CopyHandler instproc copy {obj dest} {
-  #puts stderr "[self] copy <$obj> <$dest>"
+  #puts stderr "[::xotcl::self] copy <$obj> <$dest>"
   ::xotcl::my set objLength [string length $obj]
   ::xotcl::my set dest $dest
   ::xotcl::my makeTargetList $obj
@@ -253,21 +253,21 @@
 
 
 ::xotcl::Object instproc copy newName {
-  if {[string compare [string trimleft $newName :] [string trimleft [self] :]]} {
-    [[self class]::CopyHandler new -volatile] copy [self] $newName
+  if {[string compare [string trimleft $newName :] [string trimleft [::xotcl::self] :]]} {
+    [[::xotcl::self class]::CopyHandler new -volatile] copy [::xotcl::self] $newName
   }
 }
 
 ::xotcl::Object instproc move newName {
-    if {[string compare [string trimleft $newName :] [string trimleft [self] :]]} {
+    if {[string compare [string trimleft $newName :] [string trimleft [::xotcl::self] :]]} {
 	if {$newName != ""} {
 	    ::xotcl::my copy $newName
 	}
 	### let all subclasses get the copied class as superclass
-	if {[::xotcl::my isclass [self]] && $newName != ""} {
+	if {[::xotcl::my isclass [::xotcl::self]] && $newName != ""} {
 	    foreach subclass [my info subclass] {
 		set scl [$subclass info superclass]
-		if {[set index [lsearch -exact $scl [self]]] != -1} {
+		if {[set index [lsearch -exact $scl [::xotcl::self]]] != -1} {
 		    set scl [lreplace $scl $index $index $newName]
 		    $subclass superclass $scl
 		}
diff -u -x configure -x autom4te.cache -x .DS_Store -r -N orig/xotcl-1.1.0/unix/Makefile.in xotcl/unix/Makefile.in
--- orig/xotcl-1.1.0/unix/Makefile.in	Sun Nov 30 19:48:08 2003
+++ xotcl/unix/Makefile.in	Fri Dec  5 16:28:34 2003
@@ -201,6 +201,7 @@
 MAKE_STATIC_LIB = @MAKE_STATIC_LIB@
 OBJEXT = @OBJEXT@
 RANLIB = @RANLIB@
+RANLIB_STUB = @RANLIB_STUB@
 SHLIB_CFLAGS = @SHLIB_CFLAGS@
 SHLIB_LD = @SHLIB_LD@
 SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
@@ -313,7 +314,7 @@
 install-binaries: binaries install-lib-binaries install-bin-binaries install-pkgIndex
 
 install-aol: install-binaries install-libraries
-	$(INSTALL) ../generic/aol-xotcl.tcl /usr/local/aolserver/modules/tcl/xotcl.tcl
+	$(INSTALL) ../generic/aol-xotcl.tcl $(DESTDIR)/usr/local/aolserver/modules/tcl/xotcl.tcl
 
 
 #========================================================================
@@ -321,11 +322,11 @@
 #========================================================================
 
 install-libraries: libraries
-	$(mkinstalldirs) $(includedir)
-	@echo "Installing header files in $(includedir)"
+	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	@echo "Installing header files in $(DESTDIR)$(includedir)"
 	@for i in $(GENERIC_HDRS) ; do \
 	    echo "Installing $$i" ; \
-	    $(INSTALL_DATA) $$i $(includedir) ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
 	done;
 	@for i in $(libdirs) ; do \
 	    echo "Installing $$i" ; \
@@ -346,17 +347,17 @@
 #========================================================================
 
 install-doc: doc
-	@$(mkinstalldirs) $(mandir)/man1
-	@$(mkinstalldirs) $(mandir)/man3
-	@$(mkinstalldirs) $(mandir)/mann
+	@$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
+	@$(mkinstalldirs) $(DESTDIR)$(mandir)/man3
+	@$(mkinstalldirs) $(DESTDIR)$(mandir)/mann
 	@if test ! "x$(XOTCLSH)" = "x" ; then \
 	(cd ../man ; \
 	 for i in *.1; do \
 	    echo "Installing $$i"; \
 	    rm -f $(mandir)/man1/$$i; \
 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
-		    $$i > $(mandir)/man1/$$i; \
-	    chmod 444 $(mandir)/man1/$$i; \
+		    $$i > $(DESTDIR)$(mandir)/man1/$$i; \
+	    chmod 444 $(DESTDIR)$(mandir)/man1/$$i; \
 	    done) ; \
 	fi
 
@@ -408,7 +409,7 @@
 	@if test ! -d so; then mkdir so; fi
 	-rm -f $(xotclstub_LIB_FILE)
 	@MAKE_STATIC_LIB@
-	$(RANLIB) $(xotclstub_LIB_FILE)
+	$(RANLIB_STUB) $(xotclstub_LIB_FILE)
 
 #========================================================================
 # xotcl shells
@@ -438,10 +439,10 @@
 install-shells:
 	chmod +x xotclsh xowish 
 	@if test -e xotclsh; then \
-		$(INSTALL_PROGRAM) xotclsh $(bindir); \
+		$(INSTALL_PROGRAM) xotclsh $(DESTDIR)$(bindir); \
 	fi
 	@if test -e xowish; then \
-		$(INSTALL_PROGRAM) xowish $(bindir); \
+		$(INSTALL_PROGRAM) xowish $(DESTDIR)$(bindir); \
 	fi
 
 #========================================================================
@@ -576,8 +577,14 @@
 	done
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
+	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
+	    if test "x$$stub" = "xstub"; then \
+	    echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
+	    $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
+	    else \
 	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
 	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+	  fi; \
 	  else :; fi; \
 	done
 
diff -u -x configure -x autom4te.cache -x .DS_Store -r -N orig/xotcl-1.1.0/unix/configure.in xotcl/unix/configure.in
--- orig/xotcl-1.1.0/unix/configure.in	Sun Nov 30 11:35:08 2003
+++ xotcl/unix/configure.in	Fri Dec  5 16:28:34 2003
@@ -71,11 +71,7 @@
 
 tcl_inc=""
 if test x"${with_tclinclude}" != x ; then
-   if test -f "${with_tclinclude}/tclInt.h" ; then
       tcl_inc="-I${with_tclinclude}"
-   else
-      AC_MSG_ERROR([${with_tclinclude} directory does not contain Tcl header file tclInt.h])
-   fi
 fi
 
 #--------------------------------------------------------------------
@@ -398,6 +394,7 @@
 AC_SUBST(STUB_OBJECTS)
 AC_SUBST(STUB_SHELL_OBJECTS)
 AC_SUBST(STUB_LIB_BINARY)
+AC_SUBST(RANLIB_STUB)
 
 #--------------------------------------------------------------------
 # This macro generates a line to use when building a library.  It
@@ -418,6 +415,7 @@
 # Shared libraries and static libraries have different names.
 #--------------------------------------------------------------------
 
+RANLIB_STUB="${RANLIB}"
 case "`uname -s`" in
     *win32* | *WIN32* | *CYGWIN_NT*|*CYGWIN_98*|*CYGWIN_95*)
 	if test "${SHARED_BUILD}" = "1" ; then
@@ -431,7 +429,7 @@
 	;;
     *)
 	if test "${SHARED_BUILD}" = "1" ; then
-	    # SHLIB_LD_LIBS="${TCL_BUILD_STUB_LIB_SPEC}"
+	    SHLIB_LD_LIBS="${TCL_STUB_LIB_SPEC}"
 	    eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${SHARED_LIB_SUFFIX}"
 	    RANLIB=:
 	else
