@@ -31,10 +31,12 @@
 dnl Find the appropriate libraries to link to
 AC_SEARCH_LIBS(acos, m,, [ AC_MSG_WARN([Couldn't find acos (normally in libm)!]) ])
 AC_SEARCH_LIBS(dlsym, dl,, [ AC_MSG_WARN([Couldn't find dlsym (normally in libdl)!]) ])
 
 AS_IF([test "$TARGET" = "tclkit"], [
+	dnl We have Tclkit
+
 	dnl Figure out how to statically link to libgcc, if needed
 	DC_STATIC_LIBGCC
 
 	dnl Specify local Appinit function
 	AC_DEFINE(DTK_LOCAL_APPINIT, [TclKit_AppInit], [Tclkit appinit function])
@@ -45,25 +47,29 @@
 	DC_CHK_OS_INFO
 
 	dnl Determine how to create a shared object
 	DC_GET_SHOBJFLAGS
 
-	dnl KitDLL always uses C-VFS
-	AC_DEFINE([KIT_STORAGE_CVFS], [1], [Define if you are going to use C-VFS for kit storage])
+	dnl Determine if we have "objcopy" available to weaken non-Tcl/Tk symbols
+	AC_CHECK_TOOL(OBJCOPY, objcopy, [:])
 
 	dnl Define KitDLL usage
 	AC_DEFINE([TCLKIT_DLL], [1], [Define if you are using a KitDLL rather than a Tclkit])
 ])
+
+dnl Set linker rpath for tclsh/wish
+DC_SETLDRUNPATH([.])
 
 dnl Find the appropriate Tcl headers and libraries
 DC_DO_TCL
 
 dnl Find archives we need to link to
 DC_FIND_TCLKIT_LIBS
 
 dnl Find extra objects we need to link as a part of "kit"
 AC_SUBST(EXTRA_OBJS)
+AC_SUBST(EXTRA_VFS_OBJS)
 
 dnl Check for Windows Resource Compiler
 AC_CHECK_TOOL([RC], [windres], [false])
 
 dnl If we found the resource compiler, add "kit.res.o" to our list of objects to build
@@ -101,16 +107,14 @@
 	CFLAGS="${CFLAGS} -I${with_zlib}/include -I${with_zlib}"
 	LDFLAGS="${LDFLAGS} -L${with_zlib}/lib -L${with_zlib}"
 ])
 
 dnl Only needed for Tclkit
-AS_IF([test "$TARGET" = "tclkit"], [
-	DC_DO_STATIC_LINK_LIB(zlib, -lz,, [
-		DC_DO_STATIC_LINK_LIB(zlib, -lzlib,, [
-			AC_SEARCH_LIBS(inflate, z zlib,, [
-				AC_MSG_WARN([Couldn't find inflate (normally in zlib)!])
-			])
+DC_DO_STATIC_LINK_LIB(zlib, -lz,, [
+	DC_DO_STATIC_LINK_LIB(zlib, -lzlib,, [
+		AC_SEARCH_LIBS(inflate, z zlib,, [
+			AC_MSG_WARN([Couldn't find inflate (normally in zlib)!])
 		])
 	])
 ])
 
 dnl Determine which storage mechanism to use
@@ -181,10 +185,11 @@
 		dnl Define that C-VFS should be make [load]-able
 		AC_DEFINE([KITDLL_MAKE_LOADABLE], [1], [Specify that the C-VFS should be able to be loaded])
 
 		dnl Add appropriate dependencies
 		EXTRA_KIT_DEPS="vfs_kitdll.tcl.h"
+		EXTRA_VFS_OBJS="${EXTRA_VFS_OBJS} vfs_kitdll_data_tcl.o"
 	]
 )
 
 AC_SUBST(EXTRA_KIT_DEPS)